chore(ci): Pin CodeQL action to commit SHA

Pin GitHub/codeql-action references to full commit SHA v4.33.0 instead
of version tag to reduce supply chain risk from tag retargeting.

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Check out repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Check Python linting & PEP8 compliance
       uses: astral-sh/ruff-action@4919ec5cf1f49eff0871dbcea0da843445b837e6 # v3.6.1
@@ -63,12 +63,12 @@ jobs:
         src: "netbox/"
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: ${{ matrix.node-version }}
     
@@ -76,7 +76,7 @@ jobs:
       run: npm install -g yarn
     
     - name: Setup Node.js with Yarn Caching
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: ${{ matrix.node-version }}
         cache: yarn

.github/workflows/claude-code-review.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 1
 

.github/workflows/claude.yml

@@ -26,7 +26,7 @@ jobs:
       actions: read # Required for Claude to read CI results on PRs
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 1
 

.github/workflows/close-incomplete-issues.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'netbox-community/netbox'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           close-issue-message: >
             This issue is being closed as no further information has been provided. If

.github/workflows/close-stale-issues.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'netbox-community/netbox'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           # General parameters
           operations-per-run: 200

.github/workflows/codeql.yml

@@ -27,16 +27,16 @@ jobs:
           build-mode: none
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         config-file: .github/codeql/codeql-config.yml
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/lock-threads.yml

@@ -19,6 +19,6 @@ jobs:
     if: github.repository == 'netbox-community/netbox'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v6.0.0
+      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
         with:
           discussion-inactive-days: 180

.github/workflows/update-translation-strings.yml

@@ -27,12 +27,12 @@ jobs:
         private-key: ${{ secrets.HOUSEKEEPING_SECRET_KEY }}
 
     - name: Check out repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
           token: ${{ steps.app-token.outputs.token }}
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: 3.12
 

netbox/ipam/models/vlans.py

@@ -364,6 +364,7 @@ class VLANTranslationPolicy(PrimaryModel):
         max_length=100,
         unique=True,
     )
+
     class Meta:
         verbose_name = _('VLAN translation policy')
         verbose_name_plural = _('VLAN translation policies')

netbox/ipam/ui/attrs.py

@@ -1,25 +0,0 @@
-from django.template.loader import render_to_string
-
-from netbox.ui import attrs
-
-
-class VRFDisplayAttr(attrs.ObjectAttribute):
-    """
-    Renders a VRF reference, displaying 'Global' when no VRF is assigned.
-    """
-    template_name = 'ipam/attrs/vrf.html'
-
-    def render(self, obj, context):
-        value = self.get_value(obj)
-        return render_to_string(self.template_name, {
-            **self.get_context(obj, context),
-            'name': context.get('name', ''),
-            'value': value,
-        })
-
-
-class VRFDisplayWithRDAttr(VRFDisplayAttr):
-    """
-    Renders a VRF reference with its route distinguisher.
-    """
-    template_name = 'ipam/attrs/vrf_with_rd.html'

netbox/ipam/ui/panels.py

@@ -2,15 +2,14 @@ from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from netbox.ui import actions, attrs, panels
-
-from .attrs import VRFDisplayAttr, VRFDisplayWithRDAttr
+from netbox.ui import actions, panels
 
 
 class FHRPGroupAssignmentsPanel(panels.ObjectPanel):
     """
     A panel which lists all FHRP group assignments for a given object.
     """
+
     template_name = 'ipam/panels/fhrp_groups.html'
     title = _('FHRP Groups')
     actions = [
@@ -36,202 +35,3 @@ class FHRPGroupAssignmentsPanel(panels.ObjectPanel):
             label=_('Assign Group'),
         ),
     ]
-
-
-class VRFPanel(panels.ObjectAttributesPanel):
-    rd = attrs.TextAttr('rd', label=_('Route Distinguisher'), style='font-monospace')
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    enforce_unique = attrs.BooleanAttr('enforce_unique', label=_('Unique IP Space'))
-    description = attrs.TextAttr('description')
-
-
-class RouteTargetPanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name', style='font-monospace')
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True)
-    description = attrs.TextAttr('description')
-
-
-class RIRPanel(panels.OrganizationalObjectPanel):
-    is_private = attrs.BooleanAttr('is_private', label=_('Private'))
-
-
-class ASNRangePanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    rir = attrs.RelatedObjectAttr('rir', linkify=True, label=_('RIR'))
-    range = attrs.TextAttr('range_as_string_with_asdot', label=_('Range'))
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    description = attrs.TextAttr('description')
-
-
-class ASNPanel(panels.ObjectAttributesPanel):
-    asn = attrs.TextAttr('asn_with_asdot', label=_('AS Number'))
-    rir = attrs.RelatedObjectAttr('rir', linkify=True, label=_('RIR'))
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    description = attrs.TextAttr('description')
-
-
-class AggregatePanel(panels.ObjectAttributesPanel):
-    family = attrs.TextAttr('family', format_string='IPv{}', label=_('Family'))
-    rir = attrs.RelatedObjectAttr('rir', linkify=True, label=_('RIR'))
-    utilization = attrs.TemplatedAttr(
-        'prefix',
-        template_name='ipam/aggregate/attrs/utilization.html',
-        label=_('Utilization'),
-    )
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    date_added = attrs.DateTimeAttr('date_added', spec='date', label=_('Date Added'))
-    description = attrs.TextAttr('description')
-
-
-class RolePanel(panels.OrganizationalObjectPanel):
-    weight = attrs.NumericAttr('weight')
-
-
-class IPRangePanel(panels.ObjectAttributesPanel):
-    family = attrs.TextAttr('family', format_string='IPv{}', label=_('Family'))
-    start_address = attrs.TextAttr('start_address', label=_('Starting Address'))
-    end_address = attrs.TextAttr('end_address', label=_('Ending Address'))
-    size = attrs.NumericAttr('size')
-    mark_populated = attrs.BooleanAttr('mark_populated', label=_('Marked Populated'))
-    mark_utilized = attrs.BooleanAttr('mark_utilized', label=_('Marked Utilized'))
-    utilization = attrs.TemplatedAttr(
-        'utilization',
-        template_name='ipam/iprange/attrs/utilization.html',
-        label=_('Utilization'),
-    )
-    vrf = VRFDisplayWithRDAttr('vrf', label=_('VRF'))
-    role = attrs.RelatedObjectAttr('role', linkify=True)
-    status = attrs.ChoiceAttr('status')
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    description = attrs.TextAttr('description')
-
-
-class IPAddressPanel(panels.ObjectAttributesPanel):
-    family = attrs.TextAttr('family', format_string='IPv{}', label=_('Family'))
-    vrf = VRFDisplayAttr('vrf', label=_('VRF'))
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    status = attrs.ChoiceAttr('status')
-    role = attrs.ChoiceAttr('role')
-    dns_name = attrs.TextAttr('dns_name', label=_('DNS Name'))
-    description = attrs.TextAttr('description')
-    assigned_object = attrs.TemplatedAttr(
-        'assigned_object',
-        template_name='ipam/ipaddress/attrs/assigned_object.html',
-        label=_('Assignment'),
-    )
-    nat_inside = attrs.TemplatedAttr(
-        'nat_inside',
-        template_name='ipam/ipaddress/attrs/nat_inside.html',
-        label=_('NAT (inside)'),
-    )
-    nat_outside = attrs.TemplatedAttr(
-        'nat_outside',
-        template_name='ipam/ipaddress/attrs/nat_outside.html',
-        label=_('NAT (outside)'),
-    )
-    is_primary_ip = attrs.BooleanAttr('is_primary_ip', label=_('Primary IP'))
-    is_oob_ip = attrs.BooleanAttr('is_oob_ip', label=_('OOB IP'))
-
-
-class VLANGroupPanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    description = attrs.TextAttr('description')
-    scope = attrs.GenericForeignKeyAttr('scope', linkify=True)
-    vid_ranges = attrs.TemplatedAttr(
-        'vid_ranges_items',
-        template_name='ipam/vlangroup/attrs/vid_ranges.html',
-        label=_('VLAN IDs'),
-    )
-    utilization = attrs.UtilizationAttr('utilization')
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-
-
-class VLANTranslationPolicyPanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    description = attrs.TextAttr('description')
-
-
-class VLANTranslationRulePanel(panels.ObjectAttributesPanel):
-    policy = attrs.RelatedObjectAttr('policy', linkify=True)
-    local_vid = attrs.NumericAttr('local_vid', label=_('Local VID'))
-    remote_vid = attrs.NumericAttr('remote_vid', label=_('Remote VID'))
-    description = attrs.TextAttr('description')
-
-
-class FHRPGroupPanel(panels.ObjectAttributesPanel):
-    protocol = attrs.ChoiceAttr('protocol')
-    group_id = attrs.NumericAttr('group_id', label=_('Group ID'))
-    name = attrs.TextAttr('name')
-    description = attrs.TextAttr('description')
-    member_count = attrs.NumericAttr('member_count', label=_('Members'))
-
-
-class FHRPGroupAuthPanel(panels.ObjectAttributesPanel):
-    title = _('Authentication')
-
-    auth_type = attrs.ChoiceAttr('auth_type', label=_('Authentication Type'))
-    auth_key = attrs.TextAttr('auth_key', label=_('Authentication Key'))
-
-
-class VLANPanel(panels.ObjectAttributesPanel):
-    region = attrs.NestedObjectAttr('site.region', linkify=True, label=_('Region'))
-    site = attrs.RelatedObjectAttr('site', linkify=True)
-    group = attrs.RelatedObjectAttr('group', linkify=True)
-    vid = attrs.NumericAttr('vid', label=_('VLAN ID'))
-    name = attrs.TextAttr('name')
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    status = attrs.ChoiceAttr('status')
-    role = attrs.RelatedObjectAttr('role', linkify=True)
-    description = attrs.TextAttr('description')
-    qinq_role = attrs.ChoiceAttr('qinq_role', label=_('Q-in-Q Role'))
-    qinq_svlan = attrs.RelatedObjectAttr('qinq_svlan', linkify=True, label=_('Q-in-Q SVLAN'))
-    l2vpn = attrs.RelatedObjectAttr('l2vpn_termination.l2vpn', linkify=True, label=_('L2VPN'))
-
-
-class VLANCustomerVLANsPanel(panels.ObjectsTablePanel):
-    """
-    A panel listing customer VLANs (C-VLANs) for an S-VLAN. Only renders when the VLAN has Q-in-Q
-    role 'svlan'.
-    """
-    def __init__(self):
-        super().__init__(
-            'ipam.vlan',
-            filters={'qinq_svlan_id': lambda ctx: ctx['object'].pk},
-            title=_('Customer VLANs'),
-            actions=[
-                actions.AddObject(
-                    'ipam.vlan',
-                    url_params={
-                        'qinq_role': 'cvlan',
-                        'qinq_svlan': lambda ctx: ctx['object'].pk,
-                    },
-                    label=_('Add a VLAN'),
-                ),
-            ],
-        )
-
-    def render(self, context):
-        obj = context.get('object')
-        if not obj or obj.qinq_role != 'svlan':
-            return ''
-        return super().render(context)
-
-
-class ServiceTemplatePanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    protocol = attrs.ChoiceAttr('protocol')
-    ports = attrs.TextAttr('port_list', label=_('Ports'))
-    description = attrs.TextAttr('description')
-
-
-class ServicePanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    parent = attrs.RelatedObjectAttr('parent', linkify=True)
-    protocol = attrs.ChoiceAttr('protocol')
-    ports = attrs.TextAttr('port_list', label=_('Ports'))
-    ip_addresses = attrs.TemplatedAttr(
-        'ipaddresses',
-        template_name='ipam/service/attrs/ip_addresses.html',
-        label=_('IP Addresses'),
-    )
-    description = attrs.TextAttr('description')

netbox/ipam/views.py

@@ -9,16 +9,8 @@ from circuits.models import Provider
 from dcim.filtersets import InterfaceFilterSet
 from dcim.forms import InterfaceFilterForm
 from dcim.models import Device, Interface, Site
-from extras.ui.panels import CustomFieldsPanel, TagsPanel
+from ipam.tables import VLANTranslationRuleTable
 from netbox.object_actions import AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport
-from netbox.ui import actions, layout
-from netbox.ui.panels import (
-    CommentsPanel,
-    ContextTablePanel,
-    ObjectsTablePanel,
-    RelatedObjectsPanel,
-    TemplatePanel,
-)
 from netbox.views import generic
 from utilities.query import count_related
 from utilities.tables import get_table_ordering
@@ -31,7 +23,6 @@ from . import filtersets, forms, tables
 from .choices import PrefixStatusChoices
 from .constants import *
 from .models import *
-from .ui import panels
 from .utils import add_available_vlans, add_requested_prefixes, annotate_ip_space
 
 #
@@ -50,27 +41,6 @@ class VRFListView(generic.ObjectListView):
 @register_model_view(VRF)
 class VRFView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = VRF.objects.all()
-    layout = layout.Layout(
-        layout.Row(
-            layout.Column(
-                panels.VRFPanel(),
-                TagsPanel(),
-            ),
-            layout.Column(
-                RelatedObjectsPanel(),
-                CustomFieldsPanel(),
-                CommentsPanel(),
-            ),
-        ),
-        layout.Row(
-            layout.Column(
-                ContextTablePanel('import_targets_table', title=_('Import Route Targets')),
-            ),
-            layout.Column(
-                ContextTablePanel('export_targets_table', title=_('Export Route Targets')),
-            ),
-        ),
-    )
 
     def get_extra_context(self, request, instance):
         import_targets_table = tables.RouteTargetTable(
@@ -164,50 +134,6 @@ class RouteTargetListView(generic.ObjectListView):
 @register_model_view(RouteTarget)
 class RouteTargetView(generic.ObjectView):
     queryset = RouteTarget.objects.all()
-    layout = layout.Layout(
-        layout.Row(
-            layout.Column(
-                panels.RouteTargetPanel(),
-                TagsPanel(),
-            ),
-            layout.Column(
-                CustomFieldsPanel(),
-                CommentsPanel(),
-            ),
-        ),
-        layout.Row(
-            layout.Column(
-                ObjectsTablePanel(
-                    'ipam.vrf',
-                    filters={'import_target_id': lambda ctx: ctx['object'].pk},
-                    title=_('Importing VRFs'),
-                ),
-            ),
-            layout.Column(
-                ObjectsTablePanel(
-                    'ipam.vrf',
-                    filters={'export_target_id': lambda ctx: ctx['object'].pk},
-                    title=_('Exporting VRFs'),
-                ),
-            ),
-        ),
-        layout.Row(
-            layout.Column(
-                ObjectsTablePanel(
-                    'vpn.l2vpn',
-                    filters={'import_target_id': lambda ctx: ctx['object'].pk},
-                    title=_('Importing L2VPNs'),
-                ),
-            ),
-            layout.Column(
-                ObjectsTablePanel(
-                    'vpn.l2vpn',
-                    filters={'export_target_id': lambda ctx: ctx['object'].pk},
-                    title=_('Exporting L2VPNs'),
-                ),
-            ),
-        ),
-    )
 
 
 @register_model_view(RouteTarget, 'add', detail=False)
@@ -266,17 +192,6 @@ class RIRListView(generic.ObjectListView):
 @register_model_view(RIR)
 class RIRView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = RIR.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.RIRPanel(),
-            TagsPanel(),
-        ],
-        right_panels=[
-            RelatedObjectsPanel(),
-            CommentsPanel(),
-            CustomFieldsPanel(),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -342,16 +257,6 @@ class ASNRangeListView(generic.ObjectListView):
 @register_model_view(ASNRange)
 class ASNRangeView(generic.ObjectView):
     queryset = ASNRange.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.ASNRangePanel(),
-            TagsPanel(),
-        ],
-        right_panels=[
-            CommentsPanel(),
-            CustomFieldsPanel(),
-        ],
-    )
 
 
 @register_model_view(ASNRange, 'asns')
@@ -432,17 +337,6 @@ class ASNListView(generic.ObjectListView):
 @register_model_view(ASN)
 class ASNView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = ASN.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.ASNPanel(),
-            TagsPanel(),
-        ],
-        right_panels=[
-            RelatedObjectsPanel(),
-            CustomFieldsPanel(),
-            CommentsPanel(),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -518,16 +412,6 @@ class AggregateListView(generic.ObjectListView):
 @register_model_view(Aggregate)
 class AggregateView(generic.ObjectView):
     queryset = Aggregate.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.AggregatePanel(),
-        ],
-        right_panels=[
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-    )
 
 
 @register_model_view(Aggregate, 'prefixes')
@@ -622,17 +506,6 @@ class RoleListView(generic.ObjectListView):
 @register_model_view(Role)
 class RoleView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = Role.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.RolePanel(),
-            TagsPanel(),
-        ],
-        right_panels=[
-            RelatedObjectsPanel(),
-            CommentsPanel(),
-            CustomFieldsPanel(),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -696,21 +569,6 @@ class PrefixListView(generic.ObjectListView):
 @register_model_view(Prefix)
 class PrefixView(generic.ObjectView):
     queryset = Prefix.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            TemplatePanel('ipam/panels/prefix.html'),
-        ],
-        right_panels=[
-            TemplatePanel('ipam/panels/prefix_addressing.html'),
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-        bottom_panels=[
-            ContextTablePanel('duplicate_prefix_table', title=_('Duplicate Prefixes')),
-            ContextTablePanel('parent_prefix_table', title=_('Parent Prefixes')),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         try:
@@ -750,13 +608,11 @@ class PrefixView(generic.ObjectView):
         )
         duplicate_prefix_table.configure(request)
 
-        result = {
+        return {
             'aggregate': aggregate,
             'parent_prefix_table': parent_prefix_table,
+            'duplicate_prefix_table': duplicate_prefix_table,
         }
-        if duplicate_prefixes.exists():
-            result['duplicate_prefix_table'] = duplicate_prefix_table
-        return result
 
 
 @register_model_view(Prefix, 'prefixes')
@@ -900,19 +756,6 @@ class IPRangeListView(generic.ObjectListView):
 @register_model_view(IPRange)
 class IPRangeView(generic.ObjectView):
     queryset = IPRange.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.IPRangePanel(),
-        ],
-        right_panels=[
-            TagsPanel(),
-            CustomFieldsPanel(),
-            CommentsPanel(),
-        ],
-        bottom_panels=[
-            ContextTablePanel('parent_prefixes_table', title=_('Parent Prefixes')),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
 
@@ -1010,23 +853,6 @@ class IPAddressListView(generic.ObjectListView):
 @register_model_view(IPAddress)
 class IPAddressView(generic.ObjectView):
     queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant')
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.IPAddressPanel(),
-            TagsPanel(),
-            CustomFieldsPanel(),
-            CommentsPanel(),
-        ],
-        right_panels=[
-            ContextTablePanel('parent_prefixes_table', title=_('Parent Prefixes')),
-            ContextTablePanel('duplicate_ips_table', title=_('Duplicate IPs')),
-            ObjectsTablePanel(
-                'ipam.service',
-                filters={'ip_address_id': lambda ctx: ctx['object'].pk},
-                title=_('Application Services'),
-            ),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         # Parent prefixes table
@@ -1059,12 +885,10 @@ class IPAddressView(generic.ObjectView):
         duplicate_ips_table = tables.IPAddressTable(duplicate_ips[:10], orderable=False)
         duplicate_ips_table.configure(request)
 
-        result = {
+        return {
             'parent_prefixes_table': parent_prefixes_table,
+            'duplicate_ips_table': duplicate_ips_table,
         }
-        if duplicate_ips.exists():
-            result['duplicate_ips_table'] = duplicate_ips_table
-        return result
 
 
 @register_model_view(IPAddress, 'add', detail=False)
@@ -1214,17 +1038,6 @@ class VLANGroupListView(generic.ObjectListView):
 @register_model_view(VLANGroup)
 class VLANGroupView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = VLANGroup.objects.annotate_utilization()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.VLANGroupPanel(),
-            TagsPanel(),
-        ],
-        right_panels=[
-            RelatedObjectsPanel(),
-            CommentsPanel(),
-            CustomFieldsPanel(),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -1312,32 +1125,19 @@ class VLANTranslationPolicyListView(generic.ObjectListView):
 
 
 @register_model_view(VLANTranslationPolicy)
-class VLANTranslationPolicyView(generic.ObjectView):
+class VLANTranslationPolicyView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = VLANTranslationPolicy.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.VLANTranslationPolicyPanel(),
-        ],
-        right_panels=[
-            TagsPanel(),
-            CustomFieldsPanel(),
-            CommentsPanel(),
-        ],
-        bottom_panels=[
-            ObjectsTablePanel(
-                'ipam.vlantranslationrule',
-                filters={'policy_id': lambda ctx: ctx['object'].pk},
-                title=_('VLAN Translation Rules'),
-                actions=[
-                    actions.AddObject(
-                        'ipam.vlantranslationrule',
-                        url_params={'policy': lambda ctx: ctx['object'].pk},
-                        label=_('Add Rule'),
-                    ),
-                ],
-            ),
-        ],
-    )
+
+    def get_extra_context(self, request, instance):
+        vlan_translation_table = VLANTranslationRuleTable(
+            data=instance.rules.all(),
+            orderable=False
+        )
+        vlan_translation_table.configure(request)
+
+        return {
+            'vlan_translation_table': vlan_translation_table,
+        }
 
 
 @register_model_view(VLANTranslationPolicy, 'add', detail=False)
@@ -1393,17 +1193,13 @@ class VLANTranslationRuleListView(generic.ObjectListView):
 
 
 @register_model_view(VLANTranslationRule)
-class VLANTranslationRuleView(generic.ObjectView):
+class VLANTranslationRuleView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = VLANTranslationRule.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.VLANTranslationRulePanel(),
-        ],
-        right_panels=[
-            TagsPanel(),
-            CustomFieldsPanel(),
-        ],
-    )
+
+    def get_extra_context(self, request, instance):
+        return {
+            'related_models': self.get_related_models(request, instance),
+        }
 
 
 @register_model_view(VLANTranslationRule, 'add', detail=False)
@@ -1455,36 +1251,7 @@ class FHRPGroupListView(generic.ObjectListView):
 
 @register_model_view(FHRPGroup)
 class FHRPGroupView(GetRelatedModelsMixin, generic.ObjectView):
-    queryset = FHRPGroup.objects.annotate(
-        member_count=count_related(FHRPGroupAssignment, 'group')
-    )
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.FHRPGroupPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-        right_panels=[
-            panels.FHRPGroupAuthPanel(),
-            RelatedObjectsPanel(),
-            CustomFieldsPanel(),
-        ],
-        bottom_panels=[
-            ObjectsTablePanel(
-                'ipam.ipaddress',
-                filters={'fhrpgroup_id': lambda ctx: ctx['object'].pk},
-                title=_('Virtual IP Addresses'),
-                actions=[
-                    actions.AddObject(
-                        'ipam.ipaddress',
-                        url_params={'fhrpgroup': lambda ctx: ctx['object'].pk},
-                        label=_('Add IP Address'),
-                    ),
-                ],
-            ),
-            ContextTablePanel('members_table', title=_('Members')),
-        ],
-    )
+    queryset = FHRPGroup.objects.all()
 
     def get_extra_context(self, request, instance):
         # Get assigned interfaces
@@ -1509,6 +1276,7 @@ class FHRPGroupView(GetRelatedModelsMixin, generic.ObjectView):
                 ),
             ),
             'members_table': members_table,
+            'member_count': FHRPGroupAssignment.objects.filter(group=instance).count(),
         }
 
 
@@ -1611,35 +1379,17 @@ class VLANListView(generic.ObjectListView):
 @register_model_view(VLAN)
 class VLANView(generic.ObjectView):
     queryset = VLAN.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.VLANPanel(),
-        ],
-        right_panels=[
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-        bottom_panels=[
-            ObjectsTablePanel(
-                'ipam.prefix',
-                filters={'vlan_id': lambda ctx: ctx['object'].pk},
-                title=_('Prefixes'),
-                actions=[
-                    actions.AddObject(
-                        'ipam.prefix',
-                        url_params={
-                            'tenant': lambda ctx: ctx['object'].tenant.pk if ctx['object'].tenant else None,
-                            'site': lambda ctx: ctx['object'].site.pk if ctx['object'].site else None,
-                            'vlan': lambda ctx: ctx['object'].pk,
-                        },
-                        label=_('Add a Prefix'),
-                    ),
-                ],
-            ),
-            panels.VLANCustomerVLANsPanel(),
-        ],
-    )
+
+    def get_extra_context(self, request, instance):
+        prefixes = Prefix.objects.restrict(request.user, 'view').filter(vlan=instance).prefetch_related(
+            'vrf', 'scope', 'role', 'tenant'
+        )
+        prefix_table = tables.PrefixTable(list(prefixes), exclude=('vlan', 'utilization'), orderable=False)
+        prefix_table.configure(request)
+
+        return {
+            'prefix_table': prefix_table,
+        }
 
 
 @register_model_view(VLAN, 'interfaces')
@@ -1733,16 +1483,6 @@ class ServiceTemplateListView(generic.ObjectListView):
 @register_model_view(ServiceTemplate)
 class ServiceTemplateView(generic.ObjectView):
     queryset = ServiceTemplate.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.ServiceTemplatePanel(),
-        ],
-        right_panels=[
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-    )
 
 
 @register_model_view(ServiceTemplate, 'add', detail=False)
@@ -1799,16 +1539,6 @@ class ServiceListView(generic.ObjectListView):
 @register_model_view(Service)
 class ServiceView(generic.ObjectView):
     queryset = Service.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.ServicePanel(),
-        ],
-        right_panels=[
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-    )
 
     def get_extra_context(self, request, instance):
         context = {}

netbox/templates/ipam/aggregate.html

@@ -1 +1,62 @@
 {% extends 'ipam/aggregate/base.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Aggregate" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Family" %}</th>
+            <td>IPv{{ object.family }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "RIR" %}</th>
+            <td>
+              <a href="{% url 'ipam:aggregate_list' %}?rir={{ object.rir.slug }}">{{ object.rir }}</a>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Utilization" %}</th>
+            <td>
+              {% utilization_graph object.get_utilization %}
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Tenant" %}</th>
+            <td>
+              {% if object.tenant.group %}
+                {{ object.tenant.group|linkify }} /
+              {% endif %}
+              {{ object.tenant|linkify|placeholder }}
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Date Added" %}</th>
+            <td>{{ object.date_added|isodate|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row mb-3">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/aggregate/attrs/utilization.html

@@ -1,2 +0,0 @@
-{% load helpers %}
-{% utilization_graph object.get_utilization %}

netbox/templates/ipam/asn.html

@@ -1,4 +1,8 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load i18n %}
 
 {% block breadcrumbs %}
@@ -8,3 +12,51 @@
     <li class="breadcrumb-item"><a href="{% url 'ipam:asn_list' %}?range_id={{ object.range.pk }}">{{ object.range }}</a></li>
   {% endif %}
 {% endblock breadcrumbs %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "ASN" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "AS Number" %}</th>
+            <td>{{ object.asn_with_asdot }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "RIR" %}</th>
+            <td>
+              <a href="{% url 'ipam:asn_list' %}?rir={{ object.rir.slug }}">{{ object.rir }}</a>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Tenant" %}</th>
+            <td>
+              {% if object.tenant.group %}
+                {{ object.tenant.group|linkify }} /
+              {% endif %}
+              {{ object.tenant|linkify|placeholder }}
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+      {% include 'inc/panels/tags.html' %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/related_objects.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock content %}

netbox/templates/ipam/asnrange.html

@@ -1 +1,57 @@
 {% extends 'ipam/asnrange/base.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "ASN Range" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "RIR" %}</th>
+            <td>
+              <a href="{% url 'ipam:asnrange_list' %}?rir={{ object.rir.slug }}">{{ object.rir }}</a>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Range" %}</th>
+            <td>{{ object.range_as_string_with_asdot }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Tenant" %}</th>
+            <td>
+              {% if object.tenant.group %}
+                {{ object.tenant.group|linkify }} /
+              {% endif %}
+              {{ object.tenant|linkify|placeholder }}
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+      {% include 'inc/panels/tags.html' %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/comments.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock content %}

netbox/templates/ipam/attrs/vrf.html

@@ -1,2 +0,0 @@
-{% load helpers i18n %}
-{% if value %}{{ value|linkify }}{% else %}<span>{% trans "Global" %}</span>{% endif %}

netbox/templates/ipam/attrs/vrf_with_rd.html

@@ -1,2 +0,0 @@
-{% load helpers i18n %}
-{% if value %}{{ value|linkify }} ({{ value.rd }}){% else %}<span>{% trans "Global" %}</span>{% endif %}

netbox/templates/ipam/fhrpgroup.html

@@ -1,4 +1,7 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load i18n %}
 
 {# Omit assigned IP addresses from object representation #}
@@ -8,3 +11,75 @@
   {{ block.super }}
   <li class="breadcrumb-item"><a href="{% url 'ipam:fhrpgroup_list' %}?protocol={{ object.protocol }}">{{ object.get_protocol_display }}</a></li>
 {% endblock breadcrumbs %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "FHRP Group" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Protocol" %}</th>
+            <td>{{ object.get_protocol_display }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Group ID" %}</th>
+            <td>{{ object.group_id }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Members" %}</th>
+            <td>{{ member_count }}</td>
+          </tr>
+        </table>
+      </div>
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Authentication" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Authentication Type" %}</th>
+            <td>{{ object.get_auth_type_display|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Authentication Key" %}</th>
+            <td>{{ object.auth_key|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% include 'inc/panels/related_objects.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      <div class="card">
+        <h2 class="card-header">
+          {% trans "Virtual IP Addresses" %}
+          {% if perms.ipam.add_ipaddress %}
+            <div class="card-actions">
+              <a href="{% url 'ipam:ipaddress_add' %}?fhrpgroup={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
+                <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add IP Address" %}
+              </a>
+            </div>
+          {% endif %}
+        </h2>
+        {% htmx_table 'ipam:ipaddress_list' fhrpgroup_id=object.pk %}
+      </div>
+      {% include 'inc/panel_table.html' with table=members_table heading='Members' %}
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/ipaddress.html

@@ -1 +1,129 @@
-{% extends 'ipam/ipaddress/base.html' %}
+{% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+	<div class="col col-12 col-md-4">
+      <div class="card">
+          <h2 class="card-header">{% trans "IP Address" %}</h2>
+          <table class="table table-hover attr-table">
+              <tr>
+                  <th scope="row">{% trans "Family" %}</th>
+                  <td>IPv{{ object.family }}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "VRF" %}</th>
+                  <td>
+                      {% if object.vrf %}
+                          <a href="{% url 'ipam:vrf' pk=object.vrf.pk %}">{{ object.vrf }}</a>
+                      {% else %}
+                          <span>{% trans "Global" %}</span>
+                      {% endif %}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Tenant" %}</th>
+                  <td>
+                      {% if object.tenant.group %}
+                          {{ object.tenant.group|linkify }} /
+                      {% endif %}
+                      {{ object.tenant|linkify|placeholder }}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Status" %}</th>
+                  <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Role" %}</th>
+                  <td>
+                      {% if object.role %}
+                          <a href="{% url 'ipam:ipaddress_list' %}?role={{ object.role }}">{{ object.get_role_display }}</a>
+                      {% else %}
+                          {{ ''|placeholder }}
+                      {% endif %}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "DNS Name" %}</th>
+                  <td>{{ object.dns_name|placeholder }}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Description" %}</th>
+                  <td>{{ object.description|placeholder }}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Assignment" %}</th>
+                  <td>
+                    {% if object.assigned_object %}
+                      {% if object.assigned_object.parent_object %}
+                        {{ object.assigned_object.parent_object|linkify }} /
+                      {% endif %}
+                      {{ object.assigned_object|linkify }}
+                    {% else %}
+                      {{ ''|placeholder }}
+                    {% endif %}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "NAT (inside)" %}</th>
+                  <td>
+                      {% if object.nat_inside %}
+                          {{ object.nat_inside|linkify }}
+                          {% if object.nat_inside.assigned_object %}
+                              ({{ object.nat_inside.assigned_object.parent_object|linkify }})
+                          {% endif %}
+                      {% else %}
+                          {{ ''|placeholder }}
+                      {% endif %}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "NAT (outside)" %}</th>
+                  <td>
+                    {% for ip in object.nat_outside.all %}
+                      {{ ip|linkify }}
+                      {% if ip.assigned_object %}
+                        ({{ ip.assigned_object.parent_object|linkify }})
+                      {% endif %}<br/>
+                    {% empty %}
+                      {{ ''|placeholder }}
+                    {% endfor %}
+                  </td>
+              </tr>
+              <tr>
+                <th scope="row">Primary IP</th>
+                <td>{% checkmark object.is_primary_ip %}</td>
+              </tr>
+              <tr>
+                <th scope="row">OOB IP</th>
+                <td>{% checkmark object.is_oob_ip %}</td>
+              </tr>
+          </table>
+      </div>
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_left_page object %}
+	</div>
+	<div class="col col-md-8">
+    {% include 'inc/panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}
+    {% if duplicate_ips_table.rows %}
+      {% include 'inc/panel_table.html' with table=duplicate_ips_table heading='Duplicate IPs' panel_class='danger' %}
+    {% endif %}
+    <div class="card">
+      <h2 class="card-header">{% trans "Application Services" %}</h2>
+      {% htmx_table 'ipam:service_list' ip_address_id=object.pk %}
+    </div>
+    {% plugin_right_page object %}
+	</div>
+</div>
+<div class="row">
+  <div class="col col-md-12">
+    {% plugin_full_width_page object %}
+  </div>
+</div>
+{% endblock %}

netbox/templates/ipam/ipaddress/attrs/assigned_object.html

@@ -1,2 +0,0 @@
-{% load helpers %}
-{% if value.parent_object %}{{ value.parent_object|linkify }} / {% endif %}{{ value|linkify }}

netbox/templates/ipam/ipaddress/attrs/nat_inside.html

@@ -1,2 +0,0 @@
-{% load helpers %}
-{{ value|linkify }}{% if value.assigned_object %} ({{ value.assigned_object.parent_object|linkify }}){% endif %}

netbox/templates/ipam/ipaddress/attrs/nat_outside.html

@@ -1,2 +0,0 @@
-{% load helpers %}
-{% for ip in value.all %}{{ ip|linkify }}{% if ip.assigned_object %} ({{ ip.assigned_object.parent_object|linkify }}){% endif %}<br/>{% empty %}<span class="text-muted">&mdash;</span>{% endfor %}

netbox/templates/ipam/iprange.html

@@ -1 +1,98 @@
 {% extends 'ipam/iprange/base.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+  <div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">{% trans "IP Range" %}</h2>
+      <table class="table table-hover attr-table">
+        <tr>
+            <th scope="row">{% trans "Family" %}</th>
+            <td>IPv{{ object.family }}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Starting Address" %}</th>
+            <td>{{ object.start_address }}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Ending Address" %}</th>
+            <td>{{ object.end_address }}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Size" %}</th>
+            <td>{{ object.size }}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Marked Populated" %}</th>
+            <td>{% checkmark object.mark_populated %}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Marked Utilized" %}</th>
+            <td>{% checkmark object.mark_utilized %}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Utilization" %}</th>
+            <td>
+              {% if object.mark_utilized %}
+                {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %}
+              {% else %}
+                {% utilization_graph object.utilization %}
+              {% endif %}
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "VRF" %}</th>
+            <td>
+                {% if object.vrf %}
+                    {{ object.vrf|linkify }} ({{ object.vrf.rd }})
+                {% else %}
+                    <span>{% trans "Global" %}</span>
+                {% endif %}
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Role" %}</th>
+            <td>{{ object.role|linkify|placeholder }}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Status" %}</th>
+            <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Tenant" %}</th>
+            <td>
+                {% if object.tenant.group %}
+                    {{ object.tenant.group|linkify }} /
+                {% endif %}
+                {{ object.tenant|linkify|placeholder }}
+            </td>
+        </tr>
+        <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+        </tr>
+      </table>
+    </div>
+    {% plugin_left_page object %}
+  </div>
+  <div class="col col-12 col-md-6">
+    {% include 'inc/panels/tags.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% plugin_right_page object %}
+  </div>
+</div>
+<div class="row">
+  <div class="col col-md-12">
+    {% include 'inc/panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}
+  </div>
+</div>
+<div class="row">
+  <div class="col col-md-12">
+    {% plugin_full_width_page object %}
+  </div>
+</div>
+{% endblock %}

netbox/templates/ipam/iprange/attrs/utilization.html

@@ -1,6 +0,0 @@
-{% load helpers %}
-{% if object.mark_utilized %}
-  {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %}
-{% else %}
-  {% utilization_graph value %}
-{% endif %}

netbox/templates/ipam/panels/prefix.html

@@ -1,76 +0,0 @@
-{% load helpers i18n %}
-<div class="card">
-  <h2 class="card-header">{% trans "Prefix" %}</h2>
-  <table class="table table-hover attr-table">
-    <tr>
-      <th scope="row">{% trans "Family" %}</th>
-      <td>IPv{{ object.family }}</td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "VRF" %}</th>
-      <td>
-        {% if object.vrf %}
-          {{ object.vrf|linkify }}
-        {% else %}
-          <span>{% trans "Global" %}</span>
-        {% endif %}
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Tenant" %}</th>
-      <td>
-        {% if object.tenant.group %}
-          {{ object.tenant.group|linkify }} /
-        {% endif %}
-        {{ object.tenant|linkify|placeholder }}
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Aggregate" %}</th>
-      <td>
-        {% if aggregate %}
-          {{ aggregate|linkify }} ({{ aggregate.rir }})
-        {% else %}
-          {{ ''|placeholder }}
-        {% endif %}
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Scope" %}</th>
-      {% if object.scope %}
-        <td>{{ object.scope|linkify }} ({% trans object.scope_type.name %})</td>
-      {% else %}
-        <td>{{ ''|placeholder }}</td>
-      {% endif %}
-    </tr>
-    <tr>
-      <th scope="row">{% trans "VLAN" %}</th>
-      <td>
-        {% if object.vlan %}
-          {% if object.vlan.group %}
-            {{ object.vlan.group|linkify }} /
-          {% endif %}
-          {{ object.vlan|linkify }}
-        {% else %}
-          {{ ''|placeholder }}
-        {% endif %}
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Status" %}</th>
-      <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Role" %}</th>
-      <td>{{ object.role|linkify|placeholder }}</td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Description" %}</th>
-      <td>{{ object.description|placeholder }}</td>
-    </tr>
-    <tr>
-      <th scope="row">{% trans "Is a pool" %}</th>
-      <td>{% checkmark object.is_pool %}</td>
-    </tr>
-  </table>
-</div>

netbox/templates/ipam/panels/prefix_addressing.html

@@ -1,62 +0,0 @@
-{% load humanize helpers i18n %}
-<div class="card">
-  <h2 class="card-header">
-    {% trans "Addressing" %}
-    {% if object.prefix.version == 4 %}
-      <div class="card-actions">
-        <a class="btn btn-ghost-primary btn-sm" data-bs-toggle="modal" data-bs-target="#prefix-modal">
-          <i class="mdi mdi-information-outline" aria-hidden="true"></i> {% trans "Addressing Details" %}
-        </a>
-      </div>
-    {% endif %}
-  </h2>
-  <table class="table table-hover attr-table">
-    <tr>
-      <th scope="row">{% trans "Utilization" %}</th>
-      <td>
-        {% if object.mark_utilized %}
-          {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %}
-          <small>({% trans "Marked fully utilized" %})</small>
-        {% else %}
-          {% utilization_graph object.get_utilization %}
-        {% endif %}
-      </td>
-    </tr>
-    {% with child_ip_count=object.get_child_ips.count %}
-      <tr>
-        <th scope="row">{% trans "Child IPs" %}</th>
-        <td>
-          <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">{{ child_ip_count }}</a>
-        </td>
-      </tr>
-    {% endwith %}
-    {% with available_count=object.get_available_ips.size %}
-      <tr>
-        <th scope="row">{% trans "Available IPs" %}</th>
-        <td>
-          {% if available_count > 1000000 %}
-            {{ available_count|intword }}
-          {% else %}
-            {{ available_count|intcomma }}
-          {% endif %}
-        </td>
-      </tr>
-    {% endwith %}
-    <tr>
-      <th scope="row">{% trans "First available IP" %}</th>
-      <td>
-        {% with first_available_ip=object.get_first_available_ip %}
-          {% if first_available_ip %}
-            {% if perms.ipam.add_ipaddress %}
-              <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}{% if object.vrf %}&vrf={{ object.vrf_id }}{% endif %}{% if object.tenant %}&tenant={{ object.tenant.pk }}{% endif %}">{{ first_available_ip }}</a>
-            {% else %}
-              {{ first_available_ip }}
-            {% endif %}
-          {% else %}
-            {{ ''|placeholder }}
-          {% endif %}
-        {% endwith %}
-      </td>
-    </tr>
-  </table>
-</div>

netbox/templates/ipam/prefix.html

@@ -1 +1,202 @@
 {% extends 'ipam/prefix/base.html' %}
+{% load humanize %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+{% load mptt %}
+
+{% block content %}
+<div class="row">
+  <div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">{% trans "Prefix" %}</h2>
+      <table class="table table-hover attr-table">
+        <tr>
+          <th scope="row">{% trans "Family" %}</th>
+          <td>IPv{{ object.family }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "VRF" %}</th>
+          <td>
+            {% if object.vrf %}
+              <a href="{% url 'ipam:vrf' pk=object.vrf.pk %}">{{ object.vrf }}</a>
+            {% else %}
+              <span>{% trans "Global" %}</span>
+            {% endif %}
+          </td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Tenant" %}</th>
+            <td>
+              {% if object.tenant.group %}
+                {{ object.tenant.group|linkify }} /
+              {% endif %}
+              {{ object.tenant|linkify|placeholder }}
+            </td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Aggregate" %}</th>
+          <td>
+            {% if aggregate %}
+              <a href="{% url 'ipam:aggregate' pk=aggregate.pk %}">{{ aggregate.prefix }}</a> ({{ aggregate.rir }})
+            {% else %}
+              {{ ''|placeholder }}
+            {% endif %}
+          </td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Scope" %}</th>
+          {% if object.scope %}
+            <td>{{ object.scope|linkify }} ({% trans object.scope_type.name %})</td>
+          {% else %}
+            <td>{{ ''|placeholder }}</td>
+          {% endif %}
+        </tr>
+        <tr>
+          <th scope="row">{% trans "VLAN" %}</th>
+          <td>
+            {% if object.vlan %}
+              {% if object.vlan.group %}
+                {{ object.vlan.group|linkify }} /
+              {% endif %}
+              {{ object.vlan|linkify }}
+            {% else %}
+              {{ ''|placeholder }}
+            {% endif %}
+          </td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Status" %}</th>
+          <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Role" %}</th>
+          <td>{{ object.role|linkify|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Description" %}</th>
+          <td>{{ object.description|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Is a pool" %}</th>
+          <td>{% checkmark object.is_pool %}</td>
+        </tr>
+      </table>
+    </div>
+    {% plugin_left_page object %}
+  </div>
+  <div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">
+        {% trans "Addressing" %}
+        {% if object.prefix.version == 4 %}
+          <div class="card-actions">
+            <a class="btn btn-ghost-primary btn-sm" data-bs-toggle="modal" data-bs-target="#prefix-modal">
+              <i class="mdi mdi-information-outline" aria-hidden="true"></i> {% trans "Addressing Details" %}
+            </a>
+          </div>
+        {% endif %}
+      </h2>
+      <table class="table table-hover attr-table">
+        <tr>
+          <th scope="row">{% trans "Utilization" %}</th>
+          <td>
+            {% if object.mark_utilized %}
+              {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %}
+              <small>({% trans "Marked fully utilized" %})</small>
+            {% else %}
+              {% utilization_graph object.get_utilization %}
+            {% endif %}
+          </td>
+        </tr>
+        {% with child_ip_count=object.get_child_ips.count %}
+          <tr>
+            <th scope="row">{% trans "Child IPs" %}</th>
+            <td>
+              <a href="{% url 'ipam:prefix_ipaddresses' pk=object.pk %}">{{ child_ip_count }}</a>
+            </td>
+          </tr>
+        {% endwith %}
+        {% with available_count=object.get_available_ips.size %}
+          <tr>
+            <th scope="row">{% trans "Available IPs" %}</th>
+            <td>
+              {# Use human-friendly words for counts greater than one million #}
+              {% if available_count > 1000000 %}
+                {{ available_count|intword }}
+              {% else %}
+                {{ available_count|intcomma }}
+              {% endif %}
+            </td>
+          </tr>
+        {% endwith %}
+        <tr>
+            <th scope="row">{% trans "First available IP" %}</th>
+          <td>
+            {% with first_available_ip=object.get_first_available_ip %}
+              {% if first_available_ip %}
+                {% if perms.ipam.add_ipaddress %}
+                  <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}{% if object.vrf %}&vrf={{ object.vrf_id }}{% endif %}{% if object.tenant %}&tenant={{ object.tenant.pk }}{% endif %}">{{ first_available_ip }}</a>
+                {% else %}
+                  {{ first_available_ip }}
+                {% endif %}
+              {% else %}
+                {{ ''|placeholder }}
+              {% endif %}
+            {% endwith %}
+          </td>
+        </tr>
+      </table>
+    </div>
+    {% include 'inc/panels/custom_fields.html' %}
+    {% include 'inc/panels/tags.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% plugin_right_page object %}
+  </div>
+</div>
+<div class="row">
+    <div class="col col-md-12">
+        {% if duplicate_prefix_table.rows %}
+            {% include 'inc/panel_table.html' with table=duplicate_prefix_table heading='Duplicate Prefixes' %}
+        {% endif %}
+        {% include 'inc/panel_table.html' with table=parent_prefix_table heading='Parent Prefixes' %}
+        {% plugin_full_width_page object %}
+    </div>
+</div>
+{% endblock %}
+
+{% block modals %}
+  {{ block.super }}
+  {% if object.prefix.version == 4 %}
+    <div class="modal fade" id="prefix-modal" tabindex="-1" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">{% trans "Prefix Details" %}</h5>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          </div>
+          <div class="modal-body p-0">
+            <table class="table table-hover attr-table m-0">
+              <tr>
+                <th scope="row">{% trans "Network Address" %}</th>
+                <td>{{ object.prefix.network }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{% trans "Network Mask" %}</th>
+                <td>{{ object.prefix.netmask }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{% trans "Wildcard Mask" %}</th>
+                <td>{{ object.prefix.hostmask }}</td>
+              </tr>
+              <tr>
+                <th scope="row">{% trans "Broadcast Address" %}</th>
+                <td>{{ object.prefix.broadcast }}</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+{% endblock %}

netbox/templates/ipam/prefix/base.html

@@ -1,7 +1,6 @@
 {% extends 'generic/object.html' %}
 {% load buttons %}
 {% load helpers %}
-{% load i18n %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -9,39 +8,3 @@
     <li class="breadcrumb-item"><a href="{% url 'ipam:prefix_list' %}?vrf_id={{ object.vrf.pk }}">{{ object.vrf }}</a></li>
   {% endif %}
 {% endblock %}
-
-{% block modals %}
-  {{ block.super }}
-  {% if object.prefix.version == 4 %}
-    <div class="modal fade" id="prefix-modal" tabindex="-1" aria-hidden="true">
-      <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title">{% trans "Prefix Details" %}</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-          </div>
-          <div class="modal-body p-0">
-            <table class="table table-hover attr-table m-0">
-              <tr>
-                <th scope="row">{% trans "Network Address" %}</th>
-                <td>{{ object.prefix.network }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{% trans "Network Mask" %}</th>
-                <td>{{ object.prefix.netmask }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{% trans "Wildcard Mask" %}</th>
-                <td>{{ object.prefix.hostmask }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{% trans "Broadcast Address" %}</th>
-                <td>{{ object.prefix.broadcast }}</td>
-              </tr>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-  {% endif %}
-{% endblock modals %}

netbox/templates/ipam/rir.html

@@ -1,4 +1,7 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load i18n %}
 
 {% block extra_controls %}
@@ -8,3 +11,40 @@
     </a>
   {% endif %}
 {% endblock extra_controls %}
+
+{% block content %}
+<div class="row mb-3">
+	<div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">{% trans "RIR" %}</h2>
+        <table class="table table-hover attr-table">
+        <tr>
+          <th scope="row">{% trans "Name" %}</th>
+          <td>{{ object.name }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Description" %}</th>
+          <td>{{ object.description|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Private" %}</th>
+          <td>{% checkmark object.is_private %}</td>
+        </tr>
+      </table>
+    </div>
+    {% include 'inc/panels/tags.html' %}
+    {% plugin_left_page object %}
+	</div>
+	<div class="col col-12 col-md-6">
+    {% include 'inc/panels/related_objects.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
+    {% plugin_right_page object %}
+  </div>
+</div>
+<div class="row mb-3">
+	<div class="col col-md-12">
+    {% plugin_full_width_page object %}
+  </div>
+</div>
+{% endblock %}

netbox/templates/ipam/role.html

@@ -1,4 +1,7 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load i18n %}
 
 {% block extra_controls %}
@@ -8,3 +11,40 @@
     </a>
   {% endif %}
 {% endblock extra_controls %}
+
+{% block content %}
+<div class="row mb-3">
+	<div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">{% trans "Role" %}</h2>
+      <table class="table table-hover attr-table">
+        <tr>
+          <th scope="row">{% trans "Name" %}</th>
+          <td>{{ object.name }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Description" %}</th>
+          <td>{{ object.description|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Weight" %}</th>
+          <td>{{ object.weight }}</td>
+        </tr>
+      </table>
+    </div>
+    {% include 'inc/panels/tags.html' %}
+    {% plugin_left_page object %}
+	</div>
+	<div class="col col-12 col-md-6">
+    {% include 'inc/panels/related_objects.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
+    {% plugin_right_page object %}
+  </div>
+</div>
+<div class="row mb-3">
+	<div class="col col-md-12">
+    {% plugin_full_width_page object %}
+  </div>
+</div>
+{% endblock %}

netbox/templates/ipam/routetarget.html

@@ -1 +1,68 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Route Target" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td class="font-monospace">{{ object.name }}</td>
+          </tr>
+          <tr>
+            <th  scope="row">{% trans "Tenant" %}</th>
+            <td>{{ object.tenant|linkify|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% include 'inc/panels/tags.html' %}
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row mb-3">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Importing VRFs" %}</h2>
+        {% htmx_table 'ipam:vrf_list' import_target_id=object.pk %}
+      </div>
+    </div>
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Exporting VRFs" %}</h2>
+        {% htmx_table 'ipam:vrf_list' export_target_id=object.pk %}
+      </div>
+    </div>
+  </div>
+  <div class="row mb-3">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Importing L2VPNs" %}</h2>
+        {% htmx_table 'vpn:l2vpn_list' import_target_id=object.pk %}
+      </div>
+    </div>
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Exporting L2VPNs" %}</h2>
+        {% htmx_table 'vpn:l2vpn_list' export_target_id=object.pk %}
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/service.html

@@ -1,4 +1,8 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load perms %}
+{% load plugins %}
 {% load i18n %}
 
 {% block breadcrumbs %}
@@ -10,4 +14,58 @@
       </a>
     </li>
   {% endif %}
-{% endblock breadcrumbs %}
+{% endblock %}
+
+{% block content %}
+<div class="row mb-3">
+	<div class="col col-12 col-md-6">
+        <div class="card">
+            <h2 class="card-header">{% trans "Service" %}</h2>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">{% trans "Name" %}</th>
+                    <td>{{ object.name }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Parent" %}</th>
+                    <td>{{ object.parent|linkify }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Protocol" %}</th>
+                    <td>{{ object.get_protocol_display }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Ports" %}</th>
+                    <td>{{ object.port_list }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "IP Addresses" %}</th>
+                    <td>
+                        {% for ipaddress in object.ipaddresses.all %}
+                            {{ ipaddress|linkify }}<br />
+                        {% empty %}
+                            {{ ''|placeholder }}
+                        {% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Description" %}</th>
+                    <td>{{ object.description|placeholder }}</td>
+                </tr>
+            </table>
+        </div>
+        {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+</div>
+<div class="row mb-3">
+    <div class="col col-md-12">
+        {% plugin_full_width_page object %}
+    </div>
+</div>
+{% endblock %}

netbox/templates/ipam/service/attrs/ip_addresses.html

@@ -1,2 +0,0 @@
-{% load helpers %}
-{% for ipaddress in value.all %}{{ ipaddress|linkify }}<br />{% empty %}<span class="text-muted">&mdash;</span>{% endfor %}

netbox/templates/ipam/servicetemplate.html

@@ -1 +1,46 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load perms %}
+{% load plugins %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row mb-3">
+    <div class="col col-12 col-md-6">
+      <div class="card">
+        <h2 class="card-header">{% trans "Application Service Template" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Protocol" %}</th>
+            <td>{{ object.get_protocol_display }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Ports" %}</th>
+            <td>{{ object.port_list }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-6">
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row mb-3">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/vlan.html

@@ -1 +1,129 @@
 {% extends 'ipam/vlan/base.html' %}
+{% load helpers %}
+{% load render_table from django_tables2 %}
+{% load plugins %}
+{% load i18n %}
+{% load mptt %}
+
+{% block content %}
+    <div class="row">
+        <div class="col col-12 col-md-6">
+            <div class="card">
+                <h2 class="card-header">{% trans "VLAN" %}</h2>
+                <table class="table table-hover attr-table">
+                    {% if object.site.region %}
+                        <tr>
+                            <th scope="row">{% trans "Region" %}</th>
+                            <td>
+                                {% nested_tree object.site.region %}
+                            </td>
+                        </tr>
+                    {% endif %}
+                    <tr>
+                        <th scope="row">{% trans "Site" %}</th>
+                        <td>{{ object.site|linkify|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Group" %}</th>
+                        <td>{{ object.group|linkify|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "VLAN ID" %}</th>
+                        <td>{{ object.vid }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Name" %}</th>
+                        <td>{{ object.name }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Tenant" %}</th>
+                        <td>
+                            {% if object.tenant.group %}
+                                {{ object.tenant.group|linkify }} /
+                            {% endif %}
+                            {{ object.tenant|linkify|placeholder }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Status" %}</th>
+                        <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Role" %}</th>
+                        <td>
+                            {% if object.role %}
+                                <a href="{% url 'ipam:vlan_list' %}?role={{ object.role.slug }}">{{ object.role }}</a>
+                            {% else %}
+                                {{ ''|placeholder }}
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th scope="row">{% trans "Description" %}</th>
+                        <td>{{ object.description|placeholder }}</td>
+                    </tr>
+                    <tr>
+                      <th scope="row">{% trans "Q-in-Q Role" %}</th>
+                      <td>
+                        {% if object.qinq_role %}
+                          {% badge object.get_qinq_role_display bg_color=object.get_qinq_role_color %}
+                        {% else %}
+                          {{ ''|placeholder }}
+                        {% endif %}
+                      </td>
+                    </tr>
+                    {% if object.qinq_role == 'cvlan' %}
+                      <tr>
+                        <th scope="row">{% trans "Q-in-Q SVLAN" %}</th>
+                        <td>{{ object.qinq_svlan|linkify|placeholder }}</td>
+                      </tr>
+                    {% endif %}
+                    <tr>
+                      <th scope="row">{% trans "L2VPN" %}</th>
+                      <td>{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% plugin_left_page object %}
+        </div>
+        <div class="col col-12 col-md-6">
+          {% include 'inc/panels/custom_fields.html' %}
+          {% include 'inc/panels/tags.html' %}
+          {% include 'inc/panels/comments.html' %}
+          {% plugin_right_page object %}
+        </div>
+    </div>
+    <div class="row">
+      <div class="col col-md-12">
+        <div class="card">
+          <h2 class="card-header">
+            {% trans "Prefixes" %}
+            {% if perms.ipam.add_prefix %}
+              <div class="card-actions">
+                <a href="{% url 'ipam:prefix_add' %}?{% if object.tenant %}tenant={{ object.tenant.pk }}&{% endif %}site={{ object.site.pk }}&vlan={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+                  <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Prefix" %}
+                </a>
+              </div>
+            {% endif %}
+          </h2>
+          {% htmx_table 'ipam:prefix_list' vlan_id=object.pk %}
+        </div>
+        {% if object.qinq_role == 'svlan' %}
+          <div class="card">
+            <h2 class="card-header">
+              {% trans "Customer VLANs" %}
+              {% if perms.ipam.add_vlan %}
+                <div class="card-actions">
+                  <a href="{% url 'ipam:vlan_add' %}?qinq_role=cvlan&qinq_svlan={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+                    <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a VLAN" %}
+                  </a>
+                </div>
+              {% endif %}
+            </h2>
+            {% htmx_table 'ipam:vlan_list' qinq_svlan_id=object.pk %}
+          </div>
+        {% endif %}
+        {% plugin_full_width_page object %}
+      </div>
+    </div>
+{% endblock %}

netbox/templates/ipam/vlangroup.html

@@ -1,10 +1,70 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
 {% load i18n %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  {% if object.scope %}
+    {# TODO: This should link to a filtered list of VLANGroups #}
+    <li class="breadcrumb-item">{{ object.scope|linkify }}</li>
+  {% endif %}
+{% endblock %}
+
 {% block extra_controls %}
   {% if perms.ipam.add_vlan %}
     <a href="{% url 'ipam:vlan_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add VLAN" %}
     </a>
   {% endif %}
-{% endblock extra_controls %}
+{% endblock %}
+
+{% block content %}
+<div class="row mb-3">
+	<div class="col col-12 col-md-6">
+    <div class="card">
+      <h2 class="card-header">{% trans "VLAN Group" %}</h2>
+      <table class="table table-hover attr-table">
+        <tr>
+          <th scope="row">{% trans "Name" %}</th>
+          <td>{{ object.name }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Description" %}</th>
+          <td>{{ object.description|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Scope" %}</th>
+          <td>{{ object.scope|linkify|placeholder }}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "VLAN IDs" %}</th>
+          <td>{{ object.vid_ranges_items|join:", " }}</td>
+        </tr>
+        <tr>
+          <th scope="row">Utilization</th>
+          <td>{% utilization_graph object.utilization %}</td>
+        </tr>
+        <tr>
+          <th scope="row">{% trans "Tenant" %}</th>
+          <td>
+            {% if object.tenant.group %}
+              {{ object.tenant.group|linkify }} /
+            {% endif %}
+            {{ object.tenant|linkify|placeholder }}
+          </td>
+        </tr>
+      </table>
+    </div>
+    {% include 'inc/panels/tags.html' %}
+    {% plugin_left_page object %}
+	</div>
+	<div class="col col-12 col-md-6">
+    {% include 'inc/panels/related_objects.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
+    {% plugin_right_page object %}
+  </div>
+</div>
+{% endblock %}

netbox/templates/ipam/vlangroup/attrs/vid_ranges.html

@@ -1 +0,0 @@
-{{ value|join:", " }}

netbox/templates/ipam/vlantranslationpolicy.html

@@ -1 +1,65 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-4">
+      <div class="card">
+        <h2 class="card-header">{% trans "VLAN Translation Policy" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description|placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Rules" %}</th>
+            <td>
+              {% if object.rules.count %}
+                <a href="{% url 'ipam:vlantranslationrule_list' %}?policy_id={{ object.pk }}">{{ object.rules.count }}</a>
+              {% else %}
+                0
+              {% endif %}
+            </td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-md-8">
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row mb-3">
+    <div class="col col-md-12">
+      <div class="card">
+        <h2 class="card-header">
+          {% trans "VLAN Translation Rules" %}
+          {% if perms.ipam.add_vlantranslationrule %}
+            <div class="card-actions">
+              <a href="{% url 'ipam:vlantranslationrule_add' %}?device={{ object.device.pk }}&policy={{ object.pk }}&return_url={{ object.get_absolute_url }}"
+                 class="btn btn-ghost-primary btn-sm">
+                <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Rule" %}
+              </a>
+            </div>
+          {% endif %}
+        </h2>
+        {% htmx_table 'ipam:vlantranslationrule_list' policy_id=object.pk %}
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/vlantranslationrule.html

@@ -1 +1,45 @@
 {% extends 'generic/object.html' %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+  <div class="row">
+    <div class="col col-12 col-md-4">
+      <div class="card">
+        <h2 class="card-header">{% trans "VLAN Translation Rule" %}</h2>
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Policy" %}</th>
+            <td>{{ object.policy|linkify }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Local VID" %}</th>
+            <td>{{ object.local_vid }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Remote VID" %}</th>
+            <td>{{ object.remote_vid }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description }}</td>
+          </tr>
+        </table>
+      </div>
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-12 col-md-8">
+      {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% include 'inc/panels/comments.html' %}
+      {% plugin_right_page object %}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col col-md-12">
+      {% plugin_full_width_page object %}
+    </div>
+  </div>
+{% endblock %}

netbox/templates/ipam/vrf.html

@@ -1 +1,61 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+
+{% block title %}{% trans "VRF" %} {{ object }}{% endblock %}
+
+{% block content %}
+<div class="row">
+	<div class="col col-12 col-md-6">
+      <div class="card">
+          <h2 class="card-header">{% trans "VRF" %}</h2>
+          <table class="table table-hover attr-table">
+              <tr>
+                  <th scope="row">{% trans "Route Distinguisher" %}</th>
+                  <td>{{ object.rd|placeholder }}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Tenant" %}</th>
+                  <td>
+                      {% if object.tenant.group %}
+                          {{ object.tenant.group|linkify }} /
+                      {% endif %}
+                      {{ object.tenant|linkify|placeholder }}
+                  </td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Unique IP Space" %}</th>
+                  <td>{% checkmark object.enforce_unique %}</td>
+              </tr>
+              <tr>
+                  <th scope="row">{% trans "Description" %}</th>
+                  <td>{{ object.description|placeholder }}</td>
+              </tr>
+          </table>
+      </div>
+      {% include 'inc/panels/tags.html' %}
+      {% plugin_left_page object %}
+  </div>
+  <div class="col col-12 col-md-6">
+    {% include 'inc/panels/related_objects.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
+    {% include 'inc/panels/comments.html' %}
+    {% plugin_right_page object %}
+	</div>
+</div>
+<div class="row">
+	<div class="col col-12 col-md-6">
+    {% include 'inc/panel_table.html' with table=import_targets_table heading="Import Route Targets" %}
+  </div>
+	<div class="col col-12 col-md-6">
+    {% include 'inc/panel_table.html' with table=export_targets_table heading="Export Route Targets" %}
+  </div>
+</div>
+<div class="row">
+  <div class="col col-md-12">
+    {% plugin_full_width_page object %}
+  </div>
+</div>
+{% endblock %}