From eab18a81c9088e118ce2a68e0a449967ce1935c9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 19 Aug 2016 12:19:02 -0400
Subject: [PATCH] Adjusted display of created and last_updated times for
 primary objects

---
 netbox/templates/circuits/circuit.html    |  9 +--------
 netbox/templates/circuits/provider.html   |  9 +--------
 netbox/templates/dcim/device.html         |  9 +--------
 netbox/templates/dcim/rack.html           |  9 +--------
 netbox/templates/dcim/site.html           |  9 +--------
 netbox/templates/inc/created_updated.html |  3 +++
 netbox/templates/ipam/aggregate.html      |  9 +--------
 netbox/templates/ipam/ipaddress.html      |  9 +--------
 netbox/templates/ipam/prefix.html         | 10 ++--------
 netbox/templates/ipam/vlan.html           |  9 +--------
 netbox/templates/ipam/vrf.html            |  9 +--------
 netbox/templates/secrets/secret.html      |  9 +--------
 netbox/templates/tenancy/tenant.html      |  9 +--------
 netbox/templates/users/userkey.html       |  1 +
 14 files changed, 17 insertions(+), 96 deletions(-)
 create mode 100644 netbox/templates/inc/created_updated.html

diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 489dc42a6..8844dc43a 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -102,16 +102,9 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ circuit.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ circuit.last_updated }}</td>
-                </tr>
             </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=circuit %}
 	</div>
 	<div class="col-md-6">
         <div class="panel panel-default">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 1388a2c5d..e5aa6c0c4 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -103,14 +103,6 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ provider.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ provider.last_updated }}</td>
-                </tr>
             </table>
         </div>
         <div class="panel panel-default">
@@ -125,6 +117,7 @@
                 {% endif %}
             </div>
         </div>
+        {% include 'inc/created_updated.html' with obj=provider %}
 	</div>
 	<div class="col-md-6">
         <div class="panel panel-default">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 049555571..6bdd48c29 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -79,14 +79,6 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ device.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ device.last_updated }}</td>
-                </tr>
             </table>
         </div>
         <div class="panel panel-default">
@@ -306,6 +298,7 @@
                 <div class="panel-body text-muted">None found</div>
             {% endif %}
         </div>
+        {% include 'inc/created_updated.html' with obj=device %}
 	</div>
 	<div class="col-md-6">
         {% if device_bays or device.device_type.is_parent_device %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 16a4731b6..927ec2305 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -130,14 +130,6 @@
                         <a href="{% url 'dcim:device_list' %}?rack_id={{ rack.id }}">{{ rack.devices.count }}</a>
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ rack.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ rack.last_updated }}</td>
-                </tr>
             </table>
         </div>
         <div class="panel panel-default">
@@ -187,6 +179,7 @@
                 {% endif %}
             </div>
         </div>
+        {% include 'inc/created_updated.html' with obj=rack %}
 	</div>
     <div class="row col-md-6">
        <div class="col-md-6 col-sm-6 col-xs-12">
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 2bd0ffce8..2509721b9 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -109,14 +109,6 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ site.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ site.last_updated }}</td>
-                </tr>
             </table>
         </div>
         <div class="panel panel-default">
@@ -131,6 +123,7 @@
                 {% endif %}
             </div>
         </div>
+        {% include 'inc/created_updated.html' with obj=site %}
     </div>
     <div class="col-md-5">
         <div class="panel panel-default">
diff --git a/netbox/templates/inc/created_updated.html b/netbox/templates/inc/created_updated.html
new file mode 100644
index 000000000..001bb6b85
--- /dev/null
+++ b/netbox/templates/inc/created_updated.html
@@ -0,0 +1,3 @@
+<p>
+    <small class="text-muted">Created {{ obj.created }} &middot; Updated <span title="{{ obj.last_updated }}">{{ obj.last_updated|timesince }}</span> ago</small>
+</p>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 9a0a8db1f..ec408d33b 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -77,16 +77,9 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ aggregate.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ aggregate.last_updated }}</td>
-                </tr>
             </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=aggregate %}
     </div>
 </div>
 <div class="row">
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index de5ed637b..56f95479b 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -119,16 +119,9 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ ipaddress.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ ipaddress.last_updated }}</td>
-                </tr>
             </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=ipaddress %}
 	</div>
 	<div class="col-md-6">
         {% with heading='Parent Prefixes' %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 802e9b90f..24a40ed66 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -99,16 +99,10 @@
                     <td>IP Addresses</td>
                     <td><a href="{% url 'ipam:prefix_ipaddresses' pk=prefix.pk %}">{{ ipaddress_count }}</a></td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ prefix.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ prefix.last_updated }}</td>
-                </tr>
             </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=prefix %}
+        <br />
 	</div>
 	<div class="col-md-7">
         {% if duplicate_prefix_table.rows %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index d27184824..5b9d4cd3c 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -107,17 +107,10 @@
                             <span class="text-muted">N/A</span>
                         {% endif %}
                     </td>
-                </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ vlan.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ vlan.last_updated }}</td>
                 </tr>
 		    </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=vlan %}
 	</div>
 	<div class="col-md-6">
         <div class="panel panel-default">
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index bd3cadc9e..899b14f54 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -79,17 +79,10 @@
                             <span class="text-muted">N/A</span>
                         {% endif %}
                     </td>
-                </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ vrf.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ vrf.last_updated }}</td>
                 </tr>
 		    </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=vrf %}
 	</div>
 	<div class="col-md-6">
         <div class="panel panel-default">
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index 53cdb4d7c..98007c2b9 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -56,16 +56,9 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ secret.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ secret.last_updated }}</td>
-                </tr>
             </table>
         </div>
+        {% include 'inc/created_updated.html' with obj=secret %}
 	</div>
 	<div class="col-md-6">
         {% if secret|decryptable_by:request.user %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 0ca380639..c2334bda7 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -63,14 +63,6 @@
                         {% endif %}
                     </td>
                 </tr>
-                <tr>
-                    <td>Created</td>
-                    <td>{{ tenant.created }}</td>
-                </tr>
-                <tr>
-                    <td>Last Updated</td>
-                    <td>{{ tenant.last_updated }}</td>
-                </tr>
             </table>
         </div>
         <div class="panel panel-default">
@@ -85,6 +77,7 @@
                 {% endif %}
             </div>
         </div>
+        {% include 'inc/created_updated.html' with obj=tenant %}
 	</div>
 	<div class="col-md-5">
         <div class="panel panel-default">
diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html
index cbc748d17..6318377c6 100644
--- a/netbox/templates/users/userkey.html
+++ b/netbox/templates/users/userkey.html
@@ -31,6 +31,7 @@
                     Edit user key
                 </a>
             </div>
+            {% include 'inc/created_updated.html' with obj=userkey %}
         {% else %}
             <p>You don't have a user key on file.</p>
             <p>