From b9cc93ad3fa0ac642232e583b6780fe01be8ae5d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 22 Oct 2025 15:10:19 -0400
Subject: [PATCH] Misc cleanup

---
 netbox/templates/generic/object.html | 26 +++++++++++++++++---------
 netbox/templates/users/group.html    | 10 ++++++++++
 netbox/templates/users/user.html     | 10 ++++++++++
 netbox/users/tables.py               |  1 +
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index e7ef9d97e..df95a4a42 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -55,15 +55,23 @@ Context:
 
 {% block subtitle %}
   <div class="text-secondary fs-5">
-    {% if object.owner %}
-      {{ object.owner|linkify }}
-      <span class="separator">&middot;</span>
-    {% endif %}
-    {% trans "Created" %} {{ object.created|isodatetime:"minutes" }}
-    {% if object.last_updated %}
-      <span class="separator">&middot;</span>
-      {% trans "Updated" %} {{ object.last_updated|isodatetime:"minutes" }}
-    {% endif %}
+    <ul class="list-inline">
+      {% if object.owner %}
+        <li class="list-inline-item">
+          <i class="mdi mdi-account-outline" title="{% trans "Owner" %}"></i> {{ object.owner|linkify }}
+        </li>
+      {% endif %}
+      <li class="list-inline-item">
+        <i class="mdi mdi-calendar-plus" title="{% trans "Created" %}"></i>
+        {{ object.created|isodatetime:"minutes" }}
+      </li>
+      {% if object.last_updated %}
+        <li class="list-inline-item">
+          <i class="mdi mdi-calendar-edit" title="{% trans "Last updated" %}"></i>
+          {{ object.last_updated|isodatetime:"minutes" }}
+        </li>
+      {% endif %}
+    </ul>
   </div>
 {% endblock subtitle %}
 
diff --git a/netbox/templates/users/group.html b/netbox/templates/users/group.html
index 0a89f151a..9d4561c65 100644
--- a/netbox/templates/users/group.html
+++ b/netbox/templates/users/group.html
@@ -45,6 +45,16 @@
           {% endfor %}
         </div>
       </div>
+      <div class="card">
+        <h2 class="card-header">{% trans "Owner Membership" %}</h2>
+        <div class="list-group list-group-flush">
+          {% for owner in object.owners.all %}
+            <a href="{% url 'users:owner' pk=owner.pk %}" class="list-group-item list-group-item-action">{{ owner }}</a>
+          {% empty %}
+            <div class="list-group-item text-muted">{% trans "None" %}</div>
+          {% endfor %}
+        </div>
+      </div>
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html
index 90a0bb084..efcc743f5 100644
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -63,6 +63,16 @@
           {% endfor %}
         </div>
       </div>
+      <div class="card">
+        <h2 class="card-header">{% trans "Owner Membership" %}</h2>
+        <div class="list-group list-group-flush">
+          {% for owner in object.owners.all %}
+            <a href="{% url 'users:owner' pk=owner.pk %}" class="list-group-item list-group-item-action">{{ owner }}</a>
+          {% empty %}
+            <div class="list-group-item text-muted">{% trans "None" %}</div>
+          {% endfor %}
+        </div>
+      </div>
     </div>
   </div>
   {% if perms.core.view_objectchange %}
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index 1e6fcec03..277b176fe 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -168,3 +168,4 @@ class OwnerTable(NetBoxTable):
         fields = (
             'pk', 'id', 'name', 'description', 'groups', 'users',
         )
+        default_columns = ('pk', 'name', 'description', 'groups', 'users')