From 46e144f647d3234c66828d024dcdf66f0d403d37 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Tue, 13 Apr 2021 16:03:07 -0400
Subject: [PATCH] Clean up object header

---
 netbox/project-static/css/base.css         | 3 +++
 netbox/templates/extras/report.html        | 2 +-
 netbox/templates/extras/script.html        | 2 +-
 netbox/templates/extras/script_result.html | 2 +-
 netbox/templates/generic/object.html       | 9 +++++++--
 netbox/templates/inc/created_updated.html  | 3 ---
 netbox/templates/users/userkey.html        | 4 +++-
 7 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 netbox/templates/inc/created_updated.html

diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 2efa3978f..75348a5c9 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -362,6 +362,9 @@ table.report th a {
     border-radius: .25em;
     vertical-align: middle;
 }
+h1.title {
+    margin-top: 0;
+}
 .text-nowrap {
     white-space: nowrap;
 }
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 76a34c060..f2c5edf23 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -27,7 +27,7 @@
             </form>
         </div>
     {% endif %}
-    <h1>{{ report.name }}</h1>
+    <h1 class="title">{{ report.name }}</h1>
     {% if report.description %}
         <p class="lead">{{ report.description }}</p>
     {% endif %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 3f0839512..7a99d245d 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -15,7 +15,7 @@
             </ol>
         </div>
     </div>
-    <h1>{{ script }}</h1>
+    <h1 class="title">{{ script }}</h1>
     <p>{{ script.Meta.description|render_markdown }}</p>
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index c7a7da3dd..76e0613b7 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -17,7 +17,7 @@
             </ol>
         </div>
     </div>
-    <h1>{{ script }}</h1>
+    <h1 class="title">{{ script }}</h1>
     <p>{{ script.Meta.description|render_markdown }}</p>
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index d9898a0e6..01f3c35c2 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -39,8 +39,13 @@
       {% endif %}
     {% endblock %}
   </div>
-  <h1>{% block title %}{{ object }}{% endblock %}</h1>
-  {% include 'inc/created_updated.html' %}
+  <h1 class="title">{% block title %}{{ object }}{% endblock %}</h1>
+  <p>
+    <small class="text-muted">
+      Created {{ object.created }} &middot;
+      Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago
+    </small>
+  </p>
   <div class="pull-right noprint">
     {% block tab_buttons %}
       {% custom_links object %}
diff --git a/netbox/templates/inc/created_updated.html b/netbox/templates/inc/created_updated.html
deleted file mode 100644
index 58be428c4..000000000
--- a/netbox/templates/inc/created_updated.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-    <small class="text-muted">Created {{ object.created }} &middot; Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago</small>
-</p>
diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html
index 09b5bde5b..3839a6925 100644
--- a/netbox/templates/users/userkey.html
+++ b/netbox/templates/users/userkey.html
@@ -18,7 +18,9 @@
                 <span class="label label-danger">Inactive</span>
             {% endif %}
         </h4>
-        {% include 'inc/created_updated.html' %}
+        <p>
+            <small class="text-muted">Created {{ object.created }} &middot; Updated <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> ago</small>
+        </p>
         {% if not object.is_active %}
             <div class="alert alert-warning" role="alert">
                 <i class="mdi mdi-alert"></i>