NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-21 19:18:44 -06:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.1

Browse Source
This commit is contained in:
Jeremy Stretch
2017-09-29 12:26:54 -04:00
committed by GitHub
parent 0c474a6683 3cdde72e42
commit 26c609139e
115 changed files with 1472 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/dcim/region_list.html
View File

@@ -1,8 +1,6 @@
{% extends '_base.html' %}
{% load helpers %}
{% block title %}Regions{% endblock %}
{% block content %}
<div class="pull-right">
{% if perms.dcim.add_region %}
@@ -17,7 +15,7 @@
{% endif %}
{% include 'inc/export_button.html' with obj_type='regions' %}
</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' %}