Skip to content

Commit

Permalink
Merge pull request #728 from digitalocean/develop
Browse files Browse the repository at this point in the history
Release v1.7.2-r1
  • Loading branch information
jeremystretch authored Dec 6, 2016
2 parents 66be85a + ce7ee17 commit 1f09f3d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion netbox/netbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"the documentation.")


VERSION = '1.7.2'
VERSION = '1.7.2-r1'

# Import local configuration
for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:
Expand Down
Empty file added netbox/tempfile
Empty file.
2 changes: 1 addition & 1 deletion netbox/templates/dcim/inc/_rack_elevation.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ul class="rack rack_near_face">
{% for u in primary_face %}
{% if u.device %}
<li class="occupied h{{ u.device.device_type.u_height }}u{% ifequal u.device.face face_id %} {{ u.device.device_role.color }}{% endifequal %}">
<li class="occupied h{{ u.device.device_type.u_height }}u"{% ifequal u.device.face face_id %} style="background-color: #{{ u.device.device_role.color }}"{% endifequal %}>
{% ifequal u.device.face face_id %}
<a href="{% url 'dcim:device' pk=u.device.pk %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true"
data-content="{{ u.device.device_role }}<br />{{ u.device.device_type }} ({{ u.device.device_type.u_height }}U)">
Expand Down

0 comments on commit 1f09f3d

Please sign in to comment.