Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/views/__init__.py
#	netbox/project-static/css/base.css
#	netbox/templates/base.html
#	netbox/templates/circuits/circuit.html
#	netbox/templates/circuits/circuittermination_edit.html
#	netbox/templates/circuits/inc/circuit_termination.html
#	netbox/templates/circuits/provider.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_component.html
#	netbox/templates/dcim/devicetype.html
#	netbox/templates/dcim/inc/device_napalm_tabs.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/site.html
#	netbox/templates/dcim/virtualchassis.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/object_journal.html
#	netbox/templates/extras/tag.html
#	netbox/templates/generic/object.html
#	netbox/templates/generic/object_list.html
#	netbox/templates/home.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/aggregate.html
#	netbox/templates/ipam/ipaddress.html
#	netbox/templates/ipam/prefix.html
#	netbox/templates/ipam/vlan.html
#	netbox/templates/ipam/vlangroup_edit.html
#	netbox/templates/ipam/vlangroup_vlans.html
#	netbox/templates/secrets/secret.html
#	netbox/templates/tenancy/tenant.html
#	netbox/templates/users/api_tokens.html
#	netbox/templates/virtualization/cluster.html
#	netbox/templates/virtualization/vminterface_edit.html
#	netbox/utilities/forms/fields.py
#	netbox/utilities/templates/buttons/export.html

netbox/templates/dcim/device/base.html

@@ -7,7 +7,7 @@
 
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'dcim:device_list' %}">Devices</a></li>
-  <li class="breadcrumb-item"><a href="{% url 'dcim:device_list' %}?site={{ object.site.slug }}">{{ object.site }}</a></li>
+  <li class="breadcrumb-item"><a href="{% url 'dcim:device_list' %}?site_id={{ object.site.pk }}">{{ object.site }}</a></li>
   {% if object.parent_bay %}
     <li class="breadcrumb-item"><a href="{% url 'dcim:device' pk=object.parent_bay.device.pk %}">{{ object.parent_bay.device }}</a></li>
     <li class="breadcrumb-item">{{ object.parent_bay }}</li>

netbox/templates/dcim/device/consoleports.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=consoleport_table.paginator page=consoleport_table.page %}
     {% table_config_form consoleport_table %}
 {% endblock %}
 

netbox/templates/dcim/device/consoleserverports.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=consoleserverport_table.paginator page=consoleserverport_table.page %}
     {% table_config_form consoleserverport_table %}
 {% endblock %}
 

netbox/templates/dcim/device/devicebays.html

@@ -43,6 +43,7 @@
              </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=devicebay_table.paginator page=devicebay_table.page %}
     {% table_config_form devicebay_table %}
 {% endblock %}
 

netbox/templates/dcim/device/frontports.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=frontport_table.paginator page=frontport_table.page %}
     {% table_config_form frontport_table %}
 {% endblock %}
 

netbox/templates/dcim/device/interfaces.html

@@ -49,6 +49,7 @@
              </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=interface_table.paginator page=interface_table.page %}
     {% table_config_form interface_table %}
 {% endblock %}
 

netbox/templates/dcim/device/inventory.html

@@ -43,6 +43,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=inventoryitem_table.paginator page=inventoryitem_table.page %}
     {% table_config_form inventoryitem_table %}
 {% endblock %}
 

netbox/templates/dcim/device/poweroutlets.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=poweroutlet_table.paginator page=poweroutlet_table.page %}
     {% table_config_form poweroutlet_table %}
 {% endblock %}
 

netbox/templates/dcim/device/powerports.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=powerport_table.paginator page=powerport_table.page %}
     {% table_config_form powerport_table %}
 {% endblock %}
 

netbox/templates/dcim/device/rearports.html

@@ -46,6 +46,7 @@
             </div>
         </div>
     </form>
+    {% include 'inc/paginator.html' with paginator=rearport_table.paginator page=rearport_table.page %}
     {% table_config_form rearport_table %}
 {% endblock %}