From 88095c020d4e4f017c943b2bbd283ef82bafccc1 Mon Sep 17 00:00:00 2001
From: Joseph Kennedy <joseph@netsiphon.com>
Date: Mon, 28 Aug 2017 20:24:51 -0400
Subject: [PATCH] Show description disabled by default. Added
 IFACE_STATUS_CLASSES for labels.

---
 netbox/dcim/constants.py                 | 5 +++++
 netbox/dcim/forms.py                     | 3 ++-
 netbox/dcim/models.py                    | 2 +-
 netbox/templates/dcim/device.html        | 4 ++--
 netbox/templates/dcim/inc/interface.html | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py
index 10bef0b23..777cd740c 100644
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -56,6 +56,11 @@ IFACE_ENABLED_CHOICES = [
     [IFACE_ENABLED, 'Enabled'],
 ]
 
+IFACE_STATUS_CLASSES = {
+    0: 'disabled',
+    1: 'enabled',
+}
+
 # Interface form factors
 # Virtual
 IFACE_FF_VIRTUAL = 0
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 46c782939..42bb25f54 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1623,8 +1623,9 @@ class InterfaceListFilterForm(BootstrapMixin, forms.Form):
     device = forms.CharField(required=False, label='Device name')
     enabled = forms.ChoiceField(choices=add_blank_choice(IFACE_ENABLED_CHOICES), required=False)
     role = FilterChoiceField(
+        required=False,
         queryset=DeviceRole.objects.annotate(filter_count=Count('devices')),
-        to_field_name='slug',
+        to_field_name='slug'
     )
     mac_address = forms.CharField(required=False, label='MAC address')
 
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index deaa9e834..417c916c9 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -1235,7 +1235,7 @@ class Interface(models.Model):
         return None
 
     def get_status_class(self):
-        return IFACE_ENABLED_CHOICES[self.enabled]
+        return IFACE_STATUS_CLASSES[self.enabled]
 
     # Used for  export
     def to_csv(self):
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index e12801d89..ebaa72eb4 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -388,8 +388,8 @@
                         <button class="btn btn-default btn-xs toggle-ips" selected="selected">
                             <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
                         </button>
-                        <button class="btn btn-default btn-xs toggle-description" selected="selected">
-                            <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show Description
+                        <button class="btn btn-default btn-xs toggle-description">
+                            <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show Descriptions
                         </button>
                         {% if perms.dcim.change_interface and interfaces|length > 1 %}
                             <button class="btn btn-default btn-xs toggle">
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index ed2ec4620..4ae8a0aa9 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -11,7 +11,7 @@
             <span class="label label-primary">{{ iface.lag.name }}</span>
         {% endif %}
         {% if iface.description %}
-            <i class="fa fa-fw fa-comment-o" hidden="true" title="{{ iface.description }}"></i>
+            <i class="fa fa-fw fa-comment-o" aria-hidden="true" title="{{ iface.description }}"></i>
         {% endif %}
         <td>
         {% if iface.description %}