From aa050d85cc6dfafdb1898027a456467ef3002b2f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Fri, 26 Oct 2018 13:14:12 -0400
Subject: [PATCH] Fixed color display

---
 netbox/dcim/tables.py              |  3 ++-
 netbox/project-static/css/base.css |  4 ++++
 netbox/templates/dcim/cable.html   |  2 +-
 netbox/utilities/tables.py         | 10 ++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 09c210f30..412b1224c 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, BooleanColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
 from .models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
@@ -662,6 +662,7 @@ class CableTable(BaseTable):
         template_code=CABLE_LENGTH,
         order_by='_abs_length'
     )
+    color = ColorColumn()
 
     class Meta(BaseTable.Meta):
         model = Cable
diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index 6222a477d..67b820413 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -416,6 +416,10 @@ table.report th a {
 }
 
 /* Misc */
+.color-block {
+    display: block;
+    width: 80px;
+}
 .text-nowrap {
     white-space: nowrap;
 }
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index 7f38b1ffe..95b27c8a3 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -48,7 +48,7 @@
                     <tr>
                         <td>Color</td>
                         <td>
-                            <span style="background-color: #{{ cable.color }}">{{ cable.color }}A</span>
+                            <span class="label color-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
                         </td>
                     </tr>
                     <tr>
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index cc67bbeb4..9689a20ea 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -46,3 +46,13 @@ class BooleanColumn(tables.Column):
         else:
             rendered = '<span class="text-muted">&mdash;</span>'
         return mark_safe(rendered)
+
+
+class ColorColumn(tables.Column):
+    """
+    Display a color (#RRGGBB).
+    """
+    def render(self, value):
+        return mark_safe(
+            '<span class="label color-block" style="background-color: #{}">&nbsp;</span>'.format(value)
+        )