jeremystretch 4 лет назад
Родитель
Сommit
46e144f647

+ 3 - 0
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;
 }

+ 1 - 1
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 %}

+ 1 - 1
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">

+ 1 - 1
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">

+ 7 - 2
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 %}

+ 0 - 3
netbox/templates/inc/created_updated.html

@@ -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>

+ 3 - 1
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>