From 12d643694f7bbab55ccf5c0e567fefa6f6dbe42a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 2 Aug 2017 13:15:28 -0400
Subject: [PATCH] Cleaned up title blocks

---
 netbox/templates/circuits/circuit.html                 | 4 +---
 netbox/templates/circuits/circuit_list.html            | 4 +---
 netbox/templates/circuits/circuittermination_edit.html | 6 +-----
 netbox/templates/circuits/circuittype_list.html        | 4 +---
 netbox/templates/circuits/provider.html                | 4 +---
 netbox/templates/circuits/provider_list.html           | 4 +---
 netbox/templates/dcim/console_connections_list.html    | 4 +---
 netbox/templates/dcim/consoleport_connect.html         | 4 +---
 netbox/templates/dcim/consoleserverport_connect.html   | 4 +---
 netbox/templates/dcim/device_list.html                 | 4 +---
 netbox/templates/dcim/devicebay_populate.html          | 4 +---
 netbox/templates/dcim/devicerole_list.html             | 4 +---
 netbox/templates/dcim/devicetype.html                  | 4 +---
 netbox/templates/dcim/devicetype_list.html             | 4 +---
 netbox/templates/dcim/interface_connections_list.html  | 4 +---
 netbox/templates/dcim/manufacturer_list.html           | 4 +---
 netbox/templates/dcim/platform_list.html               | 4 +---
 netbox/templates/dcim/power_connections_list.html      | 4 +---
 netbox/templates/dcim/poweroutlet_connect.html         | 4 +---
 netbox/templates/dcim/powerport_connect.html           | 4 +---
 netbox/templates/dcim/rack.html                        | 4 +---
 netbox/templates/dcim/rack_list.html                   | 4 +---
 netbox/templates/dcim/rackgroup_list.html              | 4 +---
 netbox/templates/dcim/rackrole_list.html               | 4 +---
 netbox/templates/dcim/region_list.html                 | 4 +---
 netbox/templates/dcim/site.html                        | 4 +---
 netbox/templates/dcim/site_list.html                   | 4 +---
 netbox/templates/ipam/aggregate.html                   | 4 +---
 netbox/templates/ipam/aggregate_list.html              | 4 +---
 netbox/templates/ipam/ipaddress.html                   | 4 +---
 netbox/templates/ipam/ipaddress_assign.html            | 4 +---
 netbox/templates/ipam/ipaddress_list.html              | 4 +---
 netbox/templates/ipam/prefix_ipaddresses.html          | 2 +-
 netbox/templates/ipam/prefix_list.html                 | 4 +---
 netbox/templates/ipam/rir_list.html                    | 4 +---
 netbox/templates/ipam/role_list.html                   | 4 +---
 netbox/templates/ipam/vlan.html                        | 4 +---
 netbox/templates/ipam/vlan_list.html                   | 4 +---
 netbox/templates/ipam/vlangroup_list.html              | 4 +---
 netbox/templates/ipam/vrf.html                         | 4 +---
 netbox/templates/ipam/vrf_list.html                    | 4 +---
 netbox/templates/secrets/secret.html                   | 4 +---
 netbox/templates/secrets/secret_edit.html              | 4 +---
 netbox/templates/secrets/secret_import.html            | 4 +---
 netbox/templates/secrets/secret_list.html              | 4 +---
 netbox/templates/secrets/secretrole_list.html          | 4 +---
 netbox/templates/tenancy/tenant.html                   | 4 +---
 netbox/templates/tenancy/tenant_list.html              | 4 +---
 netbox/templates/tenancy/tenantgroup_list.html         | 4 +---
 49 files changed, 49 insertions(+), 147 deletions(-)

diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index f311ccb73..383d3bb7a 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ circuit.provider }} - {{ circuit.cid }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -39,7 +37,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ circuit.provider }} - {{ circuit.cid }}</h1>
+<h1>{% block title %}{{ circuit.provider }} - {{ circuit.cid }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=circuit %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html
index 63ee92f2d..418459a15 100644
--- a/netbox/templates/circuits/circuit_list.html
+++ b/netbox/templates/circuits/circuit_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Circuits{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_circuit %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='circuits' %}
 </div>
-<h1>Circuits</h1>
+<h1>{% block title %}Circuits{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='circuits:circuit_bulk_edit' bulk_delete_url='circuits:circuit_bulk_delete' %}
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 13aa7e5b6..13052966b 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -2,10 +2,6 @@
 {% load staticfiles %}
 {% load form_helpers %}
 
-{% block title %}
-    Circuit {{ obj.circuit }} - Side {{ form.term_side.value }}
-{% endblock %}
-
 {% block content %}
     <form action="." method="post" class="form form-horizontal">
         {% csrf_token %}
@@ -14,7 +10,7 @@
         {% endfor %}
         <div class="row">
             <div class="col-md-6 col-md-offset-3">
-                <h3>Circuit {{ obj.circuit }} - Side {{ form.term_side.value }}</h3>
+                <h3>{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %}</h3>
                 {% if form.non_field_errors %}
                     <div class="panel panel-danger">
                         <div class="panel-heading"><strong>Errors</strong></div>
diff --git a/netbox/templates/circuits/circuittype_list.html b/netbox/templates/circuits/circuittype_list.html
index d59a5b82f..f545b1a1e 100644
--- a/netbox/templates/circuits/circuittype_list.html
+++ b/netbox/templates/circuits/circuittype_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Circuit Types{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_circuittype %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Circuit Types</h1>
+<h1>{% block title %}Circuit Types{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='circuits:circuittype_bulk_delete' %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 35562a7a3..6dcccfd8d 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load helpers %}
 
-{% block title %}{{ provider }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -45,7 +43,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ provider }}</h1>
+<h1>{% block title %}{{ provider }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=provider %}
 <div class="row">
 	<div class="col-md-4">
diff --git a/netbox/templates/circuits/provider_list.html b/netbox/templates/circuits/provider_list.html
index 36438d66b..9ba8bb838 100644
--- a/netbox/templates/circuits/provider_list.html
+++ b/netbox/templates/circuits/provider_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Providers{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.circuits.add_provider %}
@@ -16,7 +14,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='providers' %}
 </div>
-<h1>Providers</h1>
+<h1>{% block title %}Providers{% endblock %}</h1>
 <div class="row">
     <div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='circuits:provider_bulk_edit' bulk_delete_url='circuits:provider_bulk_delete' %}
diff --git a/netbox/templates/dcim/console_connections_list.html b/netbox/templates/dcim/console_connections_list.html
index fc2cbb762..57d3435e5 100644
--- a/netbox/templates/dcim/console_connections_list.html
+++ b/netbox/templates/dcim/console_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Console Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.change_consoleport %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Console Connections</h1>
+<h1>{% block title %}Console Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/consoleport_connect.html b/netbox/templates/dcim/consoleport_connect.html
index e06bf45ec..679540960 100644
--- a/netbox/templates/dcim/consoleport_connect.html
+++ b/netbox/templates/dcim/consoleport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ consoleport.device }} {{ consoleport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ consoleport.device }} {{ consoleport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/consoleserverport_connect.html b/netbox/templates/dcim/consoleserverport_connect.html
index 82b80e3f7..989104329 100644
--- a/netbox/templates/dcim/consoleserverport_connect.html
+++ b/netbox/templates/dcim/consoleserverport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ consoleserverport.device }} {{ consoleserverport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ consoleserverport.device }} {{ consoleserverport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index 392679348..34b143fc5 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Devices{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_device %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='devices' %}
 </div>
-<h1>Devices</h1>
+<h1>{% block title %}Devices{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'dcim/inc/device_table.html' with bulk_edit_url='dcim:device_bulk_edit' bulk_delete_url='dcim:device_bulk_delete' %}
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index 94a4ef0d0..d328d557d 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load form_helpers %}
 
-{% block title %}Populate {{ device_bay }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -17,7 +15,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Populate {{ device_bay }}</div>
+                <div class="panel-heading">{% block title %}Populate {{ device_bay }}{% endblock %}</div>
                 <div class="panel-body">
                     <div class="form-group">
                         <label class="col-md-3 control-label required">Parent Device</label>
diff --git a/netbox/templates/dcim/devicerole_list.html b/netbox/templates/dcim/devicerole_list.html
index 67ff32979..2e8189017 100644
--- a/netbox/templates/dcim/devicerole_list.html
+++ b/netbox/templates/dcim/devicerole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Device Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Device Roles</h1>
+<h1>{% block title %}Device Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:devicerole_bulk_delete' %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index aac7a0622..9eb3e0a5e 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-md-12">
@@ -31,7 +29,7 @@
     </div>
 {% endif %}
 
-<h1>{{ devicetype.manufacturer }} {{ devicetype.model }}</h1>
+<h1>{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}</h1>
 <div class="row">
     <div class="col-md-5">
         <div class="panel panel-default">
diff --git a/netbox/templates/dcim/devicetype_list.html b/netbox/templates/dcim/devicetype_list.html
index 5ab97a481..46d41782a 100644
--- a/netbox/templates/dcim/devicetype_list.html
+++ b/netbox/templates/dcim/devicetype_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Device Types{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicetype %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Device Types</h1>
+<h1>{% block title %}Device Types{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:devicetype_bulk_edit' bulk_delete_url='dcim:devicetype_bulk_delete' %}
diff --git a/netbox/templates/dcim/interface_connections_list.html b/netbox/templates/dcim/interface_connections_list.html
index a37028624..a7355a449 100644
--- a/netbox/templates/dcim/interface_connections_list.html
+++ b/netbox/templates/dcim/interface_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Interface Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_interfaceconnection %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Interface Connections</h1>
+<h1>{% block title %}Interface Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/manufacturer_list.html b/netbox/templates/dcim/manufacturer_list.html
index d535e11e8..c697127b1 100644
--- a/netbox/templates/dcim/manufacturer_list.html
+++ b/netbox/templates/dcim/manufacturer_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Manufacturers{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_manufacturer %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Manufacturers</h1>
+<h1>{% block title %}Manufacturers{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:manufacturer_bulk_delete' %}
diff --git a/netbox/templates/dcim/platform_list.html b/netbox/templates/dcim/platform_list.html
index 332447977..124277d0b 100644
--- a/netbox/templates/dcim/platform_list.html
+++ b/netbox/templates/dcim/platform_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Platforms{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_platform %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Platforms</h1>
+<h1>{% block title %}Platforms{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:platform_bulk_delete' %}
diff --git a/netbox/templates/dcim/power_connections_list.html b/netbox/templates/dcim/power_connections_list.html
index 79001fe40..50e983bec 100644
--- a/netbox/templates/dcim/power_connections_list.html
+++ b/netbox/templates/dcim/power_connections_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Power Connections{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.change_powerport %}
@@ -12,7 +10,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='connections' %}
 </div>
-<h1>Power Connections</h1>
+<h1>{% block title %}Power Connections{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'responsive_table.html' %}
diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html
index 839027db2..6c7cef449 100644
--- a/netbox/templates/dcim/poweroutlet_connect.html
+++ b/netbox/templates/dcim/poweroutlet_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ poweroutlet.device }} {{ poweroutlet }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ poweroutlet.device }} {{ poweroutlet }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/powerport_connect.html b/netbox/templates/dcim/powerport_connect.html
index a10fecc7b..1ffa6de28 100644
--- a/netbox/templates/dcim/powerport_connect.html
+++ b/netbox/templates/dcim/powerport_connect.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -21,7 +19,7 @@
                 </div>
             {% endif %}
             <div class="panel panel-default">
-                <div class="panel-heading">Connect {{ powerport.device }} {{ powerport }}</div>
+                <div class="panel-heading">{% block title %}Connect {{ powerport.device }} {{ powerport }}{% endblock %}</div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs" role="tablist">
                         <li role="presentation" class="active"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">Search</a></li>
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index d01320552..6f117076b 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ rack.site }} - Rack {{ rack.name }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -51,7 +49,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>Rack {{ rack.name }}</h1>
+<h1>{% block title %}Rack {{ rack.name }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=rack %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
index fa5371f6f..1de08d37a 100644
--- a/netbox/templates/dcim/rack_list.html
+++ b/netbox/templates/dcim/rack_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Racks{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rack %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='racks' %}
 </div>
-<h1>Racks</h1>
+<h1>{% block title %}Racks{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:rack_bulk_edit' bulk_delete_url='dcim:rack_bulk_delete' %}
diff --git a/netbox/templates/dcim/rackgroup_list.html b/netbox/templates/dcim/rackgroup_list.html
index dee6472fb..cf19005b7 100644
--- a/netbox/templates/dcim/rackgroup_list.html
+++ b/netbox/templates/dcim/rackgroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Rack Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rackgroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Rack Groups</h1>
+<h1>{% block title %}Rack Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:rackgroup_bulk_delete' %}
diff --git a/netbox/templates/dcim/rackrole_list.html b/netbox/templates/dcim/rackrole_list.html
index 3cdf33164..1133cf9b2 100644
--- a/netbox/templates/dcim/rackrole_list.html
+++ b/netbox/templates/dcim/rackrole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Rack Role{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_rackrole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Rack Roles</h1>
+<h1>{% block title %}Rack Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:rackrole_bulk_delete' %}
diff --git a/netbox/templates/dcim/region_list.html b/netbox/templates/dcim/region_list.html
index b54201a34..df7da82c8 100644
--- a/netbox/templates/dcim/region_list.html
+++ b/netbox/templates/dcim/region_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Regions{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_region %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ block.title }}</h1>
+<h1>{% block title %}Regions{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:region_bulk_delete' %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index f86565bf8..c178fbf64 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load helpers %}
 
-{% block title %}{{ site }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -50,7 +48,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ site.name }}</h1>
+<h1>{% block title %}{{ site }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=site %}
 <div class="row">
 	<div class="col-md-7">
diff --git a/netbox/templates/dcim/site_list.html b/netbox/templates/dcim/site_list.html
index 895f90804..6d3e2f7f7 100644
--- a/netbox/templates/dcim/site_list.html
+++ b/netbox/templates/dcim/site_list.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Sites{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_site %}
@@ -16,7 +14,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='sites' %}
 </div>
-<h1>Sites</h1>
+<h1>{% block title %}Sites{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='dcim:site_bulk_edit' %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 82961d3bf..63731755c 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}Aggregate: {{ aggregate }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -38,7 +36,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ aggregate }}</h1>
+<h1>{% block title %}{{ aggregate }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=aggregate %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/aggregate_list.html b/netbox/templates/ipam/aggregate_list.html
index f43274876..fde53a790 100644
--- a/netbox/templates/ipam/aggregate_list.html
+++ b/netbox/templates/ipam/aggregate_list.html
@@ -2,8 +2,6 @@
 {% load humanize %}
 {% load helpers %}
 
-{% block title %}Aggregates{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_aggregate %}
@@ -18,7 +16,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='aggregates' %}
 </div>
-<h1>Aggregates</h1>
+<h1>{% block title %}Aggregates{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:aggregate_bulk_edit' bulk_delete_url='ipam:aggregate_bulk_delete' %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index f386c89bf..789e89273 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}{{ ipaddress }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -40,7 +38,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ ipaddress }}</h1>
+<h1>{% block title %}{{ ipaddress }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=ipaddress %}
 <div class="row">
 	<div class="col-md-4">
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 03ec181ff..02eebf4e2 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Assign an IP Address{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
@@ -19,7 +17,7 @@
             {% endif %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <strong>Assign an IP Address</strong>
+                    <strong>{% block title %}Assign an IP Address{% endblock %}</strong>
                 </div>
                 <div class="panel-body">
                     <div class="form-group">
diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html
index ac1d980a2..2d273145d 100644
--- a/netbox/templates/ipam/ipaddress_list.html
+++ b/netbox/templates/ipam/ipaddress_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}IP Addresses{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_ipaddress %}
@@ -17,7 +15,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='IPs' %}
 </div>
-<h1>IP Addresses</h1>
+<h1>{% block title %}IP Addresses{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
diff --git a/netbox/templates/ipam/prefix_ipaddresses.html b/netbox/templates/ipam/prefix_ipaddresses.html
index a3554da39..1b777417d 100644
--- a/netbox/templates/ipam/prefix_ipaddresses.html
+++ b/netbox/templates/ipam/prefix_ipaddresses.html
@@ -1,6 +1,6 @@
 {% extends '_base.html' %}
 
-{% block title %}{{ prefix }}{% endblock %}
+{% block title %}{{ prefix }} - IP Addresses{% endblock %}
 
 {% block content %}
 {% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %}
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
index fd25af00d..4747731f8 100644
--- a/netbox/templates/ipam/prefix_list.html
+++ b/netbox/templates/ipam/prefix_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}Prefixes{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     <div class="btn-group" role="group">
@@ -22,7 +20,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='prefixes' %}
 </div>
-<h1>Prefixes</h1>
+<h1>{% block title %}Prefixes{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html
index 33bef6d99..df97aec88 100644
--- a/netbox/templates/ipam/rir_list.html
+++ b/netbox/templates/ipam/rir_list.html
@@ -2,8 +2,6 @@
 {% load humanize %}
 {% load helpers %}
 
-{% block title %}RIRs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if request.GET.family == '6' %}
@@ -24,7 +22,7 @@
         </a>
     {% endif %}
 </div>
-<h1>RIRs</h1>
+<h1>{% block title %}RIRs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:rir_bulk_delete' %}
diff --git a/netbox/templates/ipam/role_list.html b/netbox/templates/ipam/role_list.html
index 4ee83ad4f..6d59bc697 100644
--- a/netbox/templates/ipam/role_list.html
+++ b/netbox/templates/ipam/role_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Prefix/VLAN Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Prefix/VLAN Roles</h1>
+<h1>{% block title %}Prefix/VLAN Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:role_bulk_delete' %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 0401e75cb..4298e9b46 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}VLAN {{ vlan.display_name }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -43,7 +41,7 @@
         </a>
     {% endif %}
 </div>
-<h1>VLAN {{ vlan.display_name }}</h1>
+<h1>{% block title %}VLAN {{ vlan.display_name }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=vlan %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/vlan_list.html b/netbox/templates/ipam/vlan_list.html
index 2db914721..b5db84e52 100644
--- a/netbox/templates/ipam/vlan_list.html
+++ b/netbox/templates/ipam/vlan_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}VLANs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vlan %}
@@ -18,7 +16,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='VLANs' %}
 </div>
-<h1>VLANs</h1>
+<h1>{% block title %}VLANs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vlan_bulk_edit' bulk_delete_url='ipam:vlan_bulk_delete' %}
diff --git a/netbox/templates/ipam/vlangroup_list.html b/netbox/templates/ipam/vlangroup_list.html
index b6e1d4579..2a9e7e3ae 100644
--- a/netbox/templates/ipam/vlangroup_list.html
+++ b/netbox/templates/ipam/vlangroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}VLAN Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vlangroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>VLAN Groups</h1>
+<h1>{% block title %}VLAN Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:vlangroup_bulk_delete' %}
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index a726bb147..e041ce73a 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -1,7 +1,5 @@
 {% extends '_base.html' %}
 
-{% block title %}VRF {{ vrf }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -37,7 +35,7 @@
         </a>
     {% endif %}
 </div>
-<h1>{{ vrf }}</h1>
+<h1>{% block title %}VRF {{ vrf }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=vrf %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/ipam/vrf_list.html b/netbox/templates/ipam/vrf_list.html
index 12f0b6bc3..029426a14 100644
--- a/netbox/templates/ipam/vrf_list.html
+++ b/netbox/templates/ipam/vrf_list.html
@@ -2,8 +2,6 @@
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}VRFs{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.ipam.add_vrf %}
@@ -18,7 +16,7 @@
 	{% endif %}
     {% include 'inc/export_button.html' with obj_type='VRFs' %}
 </div>
-<h1>VRFs</h1>
+<h1>{% block title %}VRFs{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index 016015cbe..66c844ebf 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -2,8 +2,6 @@
 {% load static from staticfiles %}
 {% load secret_helpers %}
 
-{% block title %}Secret: {{ secret }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-md-12">
@@ -28,7 +26,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ secret }}</h1>
+<h1>{% block title %}{{ secret }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=secret %}
 <div class="row">
 	<div class="col-md-6">
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html
index 4a56bb368..920409177 100644
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -2,15 +2,13 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
-
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
     {% csrf_token %}
     {{ form.private_key }}
     <div class="row">
         <div class="col-md-6 col-md-offset-3">
-            <h3>{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}</h3>
+            <h3>{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}</h3>
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
diff --git a/netbox/templates/secrets/secret_import.html b/netbox/templates/secrets/secret_import.html
index edc308d06..1f12494ec 100644
--- a/netbox/templates/secrets/secret_import.html
+++ b/netbox/templates/secrets/secret_import.html
@@ -2,10 +2,8 @@
 {% load static from staticfiles %}
 {% load form_helpers %}
 
-{% block title %}Secret Import{% endblock %}
-
 {% block content %}
-<h1>Secret Import</h1>
+<h1>{% block title %}Secret Import{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-6">
         {% if form.non_field_errors %}
diff --git a/netbox/templates/secrets/secret_list.html b/netbox/templates/secrets/secret_list.html
index 29657d3f3..5293b5a6d 100644
--- a/netbox/templates/secrets/secret_list.html
+++ b/netbox/templates/secrets/secret_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Secrets{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.secrets.add_secret %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Secrets</h1>
+<h1>{% block title %}Secrets{% endblock %}</h1>
 <div class="row">
     <div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='secrets:secret_bulk_edit' bulk_delete_url='secrets:secret_bulk_delete' %}
diff --git a/netbox/templates/secrets/secretrole_list.html b/netbox/templates/secrets/secretrole_list.html
index 4b1ee0399..936445dec 100644
--- a/netbox/templates/secrets/secretrole_list.html
+++ b/netbox/templates/secrets/secretrole_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Secret Roles{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.dcim.add_devicerole %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Secret Roles</h1>
+<h1>{% block title %}Secret Roles{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='secrets:secretrole_bulk_delete' %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index bc00e399e..2c893adae 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}{{ tenant }}{% endblock %}
-
 {% block content %}
 <div class="row">
     <div class="col-sm-8 col-md-9">
@@ -41,7 +39,7 @@
 		</a>
     {% endif %}
 </div>
-<h1>{{ tenant }}</h1>
+<h1>{% block title %}{{ tenant }}{% endblock %}</h1>
 {% include 'inc/created_updated.html' with obj=tenant %}
 <div class="row">
 	<div class="col-md-7">
diff --git a/netbox/templates/tenancy/tenant_list.html b/netbox/templates/tenancy/tenant_list.html
index 81173b368..afc1a154f 100644
--- a/netbox/templates/tenancy/tenant_list.html
+++ b/netbox/templates/tenancy/tenant_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Tenants{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.tenancy.add_tenant %}
@@ -17,7 +15,7 @@
     {% endif %}
     {% include 'inc/export_button.html' with obj_type='tenants' %}
 </div>
-<h1>Tenants</h1>
+<h1>{% block title %}Tenants{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_edit_url='tenancy:tenant_bulk_edit' bulk_delete_url='tenancy:tenant_bulk_delete' %}
diff --git a/netbox/templates/tenancy/tenantgroup_list.html b/netbox/templates/tenancy/tenantgroup_list.html
index 7be881b00..f487122ab 100644
--- a/netbox/templates/tenancy/tenantgroup_list.html
+++ b/netbox/templates/tenancy/tenantgroup_list.html
@@ -1,8 +1,6 @@
 {% extends '_base.html' %}
 {% load helpers %}
 
-{% block title %}Tenant Groups{% endblock %}
-
 {% block content %}
 <div class="pull-right">
     {% if perms.tenancy.add_tenantgroup %}
@@ -12,7 +10,7 @@
         </a>
     {% endif %}
 </div>
-<h1>Tenant Groups</h1>
+<h1>{% block title %}Tenant Groups{% endblock %}</h1>
 <div class="row">
 	<div class="col-md-12">
         {% include 'utilities/obj_table.html' with bulk_delete_url='tenancy:tenantgroup_bulk_delete' %}