NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-25 22:57:45 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'develop' into v2-develop

Browse Source 
Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt
This commit is contained in:
Jeremy Stretch
2017-04-06 17:01:13 -04:00
parent 9f67da00d1 abc51fdc5d
commit 57fc6a3f50
10 changed files with 164 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/_base.html
View File

@@ -72,6 +72,8 @@
{% if perms.dcim.add_rackrole %}
<li><a href="{% url 'dcim:rackrole_add' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add a Rack Role</a></li>
{% endif %}
<li class="divider"></li>
<li><a href="{% url 'dcim:rackreservation_list' %}"><i class="fa fa-search" aria-hidden="true"></i> Rack Reservations</a></li>
</ul>
</li>
<li class="dropdown{% if request.path|contains:'/dcim/device,/dcim/manufacturers/,/dcim/platforms/' %} active{% endif %}">