From e549d2fb32844ceb91bcec730eb16c1dbdb78f7e Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sat, 23 Sep 2023 21:33:47 +0200
Subject: [PATCH 1/9] Add data properties for device interface table

Preparatory work for factoring row styling decisions out of Python code.
---
 netbox/dcim/tables/devices.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 34dbcbf30..fc8a3af73 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -69,6 +69,36 @@ def get_interface_state_attribute(record):
         return "disabled"
 
 
+def get_interface_virtual_attribute(record):
+    """
+    Get interface virtual state as string to attach to <tr/> DOM element.
+    """
+    if record.is_virtual:
+        return "true"
+    else:
+        return "false"
+
+
+def get_interface_mark_connected_attribute(record):
+    """
+    Get interface enabled state as string to attach to <tr/> DOM element.
+    """
+    if record.mark_connected:
+        return "true"
+    else:
+        return "false"
+
+
+def get_interface_cable_status_attribute(record):
+    """
+    Get interface enabled state as string to attach to <tr/> DOM element.
+    """
+    if record.cable:
+        return record.cable.status
+    else:
+        return ""
+
+
 #
 # Device roles
 #
@@ -673,6 +703,9 @@ class DeviceInterfaceTable(InterfaceTable):
             'class': get_interface_row_class,
             'data-name': lambda record: record.name,
             'data-enabled': get_interface_state_attribute,
+            'data-virtual': get_interface_virtual_attribute,
+            'data-mark-connected': get_interface_mark_connected_attribute,
+            'data-cable-status': get_interface_cable_status_attribute,
             'data-type': lambda record: record.type,
         }
 

From df34e10ee59242b73fc47c28d894811ab28e1a44 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sat, 23 Sep 2023 21:43:32 +0200
Subject: [PATCH 2/9] Add --nbx-color-* variables for theme colors

Preparatory work for moving row styling to CSS
---
 netbox/project-static/dist/netbox-dark.css  | Bin 375591 -> 376198 bytes
 netbox/project-static/dist/netbox-light.css | Bin 232798 -> 233371 bytes
 netbox/project-static/dist/netbox-print.css | Bin 727883 -> 728556 bytes
 netbox/project-static/styles/netbox.scss    |   7 +++++++
 4 files changed, 7 insertions(+)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 2d7142bc6b6da7f32935de02c63becb00dc33c22..f9d1b619bcf5d7ce3693baa5ed80987964b0a350 100644
GIT binary patch
delta 548
zcmZvYy-LJD6opw$thBI6Cx}*p192sP+W0DWGIz3r<0MS7tSK}W!56SdYbRR@!akMQ
z+1NOf1#w)<;X7x}x##6Gc>D?;`bodlZ};At|GFIZ-o4$Uyp*LTl@>Rk+l#~F7$N0&
zNr<AiWQ0%mlc4)~k$RrzSl33HL^R3L-%=tJFUL<9=dnW;pp{UCft)jl!GR1^f!Z(=
z9;e)4QWUdhc>eH$j)A^5B49M4%n?yJ$1(SBdDDoA!ghl5B;<+Xs^+?q)(2UN%&k-j
zWwS6&BO0w;-FgqAky)}?wbb?w!#L7uGIg?Al(Jk{wt0S`5tTvz4B8+_OESju(=+GC
qyaj8DabxR3Lpv^ZKqch%j4%ux?_wqz9Kt*AWVmAf&T6&vtNm}BAh&k_

delta 25
hcmZqsEw=odSVIeA3sVbo3(FSPjVrectYIw^1OSbd3HJa1

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index ffdd83285e235e4f723f8f46937a2c0ab5033570..66829e602dd097a0d7a9fff33bb7b047ba68c82c 100644
GIT binary patch
delta 589
zcmZvZO-{ow5JpwHMDz?utRp#f>@?*dtex>VwQB6hNmVKqp;B+a4i>;2kl1k)&VsG*
zXVLZZ%s1cj$HVOLX?Ay*98O-RFZ*HXo$GJ2%+@y<IOBZQdVMYYZh3w|X({UR@-OTV
zoRuTyP_j~{cmsf47iRNnQL-X|+A0?aD<oIsiwtAtR(Pvz6R1*<lQdHb+n^6j0%ZkD
zb{gHR`hc)PK$W0y<vI{rP*HrxjcK*nU?4<t98_9BTdA9PCFeO&^JHPW@vVu2TorT3
zQ>JYUlbq5;+S;Rx;Q#5)hhFzrle6L1{SJ+B+wlH~hQ=e>fR32$QJ6sH1ga`^2RjjG
phy?NDe3a055&u}onzA~TP#XcU4I!zw?MnBtzf$V$c|UzW{RBeQzuEu*

delta 26
icmbO|pYPr*zJ?aY7N#xC3mc~&sAp!|{-l|CJ2wEAwhHwC

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index b492e4d1dbd0bfe6538e68d291f6d78972bb52ea..5368b2956d88f1f8c109c0dd4b7fccd8706310dd 100644
GIT binary patch
delta 576
zcmZY6y-ve06a`=vXrWy}VnyoONKW$)&%)r?*Qtf&ASYGG6b4Uhh@k^g-+%?7GB7do
zDhzC0v4No`qxH$x=N^A-W}k1fTRqTwdS4&tp&sc&eWb@Pll6A>csITrl2VlF{_CWZ
z`HlB;@G2msq*%4*XVaJ@Q9>^~Z-<wJKvfy^vowi92f1XWktn1wLyk09NiGY6j1eCt
z4pQ970+c~Yf+&m}6uel}h9Cn1%psHV%196fICP)O#S)Al8Uu6lb4ht&L&mX>*!*wa
zZxIjggX5hhuDP`1X&eNpyQczbp&zzX*lc2q(FA<=QVT+qjkSIQg#wU<{H*JhS_2k_
z=7?mO+Z$=Iy@V*i|LQIjw*QA|9_8--xxmD3g^=4=v*5K2zIskar?2bn<Z1d1l&HOH

delta 35
rcmaE}Tj%sPorV_17N!>F7M2#)7Pc1l7LFFqEnM@yZ@2%&wN@Db|HTdO

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 94fddc32c..f7d3d7069 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -835,6 +835,13 @@ table tbody {
   }
 }
 
+// Expose theme colors as variables. (Useful for dynamic styling of choices etc.)
+:root {
+  @each $color, $value in $theme-colors {
+    --nbx-color-#{$color}: #{$value};
+  }
+}
+
 // Style objects with statuses/roles within a table. As of implementation, used for IP addresses
 // assigned to interfaces.
 table .table-badge-group {

From 3b2a23c3a88c1cd609168b5548dd2b0058e088a5 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sat, 23 Sep 2023 23:01:08 +0200
Subject: [PATCH 3/9] Add 15% alpha variants of --nbx-color

Preparatory work for factoring row styling out of Python
---
 netbox/project-static/dist/netbox-dark.css  | Bin 376198 -> 377206 bytes
 netbox/project-static/dist/netbox-light.css | Bin 233371 -> 234355 bytes
 netbox/project-static/dist/netbox-print.css | Bin 728556 -> 729540 bytes
 netbox/project-static/styles/netbox.scss    |   2 ++
 4 files changed, 2 insertions(+)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index f9d1b619bcf5d7ce3693baa5ed80987964b0a350..3032fe467ea47d59c64340686dd42ea368d0ac99 100644
GIT binary patch
delta 850
zcmZvaKTE?v7{>9>iG!dn>L8L@qgER6u1Q;UaC33>3tZA`4928fTWbeFqzFzO9J0AM
zHE|IHCj~!%lV8Bq(M1p!--{_+Xd&DXe)qi3`#g8`JNJD#f6*D~jCRI4<B#a0r`EW0
zLU~)G*w|6HZPIm&xAF=umh%cR^t`f(ja=~FL)sLxe6NzQ!N%8kCiv;0tXgkc7OU4&
z3MEh|7vL~RqA(qzwPnYv`Y8@35ds|1iwTzt(T3Wh+;cozLWyAjg~1fw>ZAK1%B@tW
zXEQF71u%`{LkH#9z8RwRtn1iE4H+chjSx^H1@IAr=iqV@c03l`|BkmIQkG4($)u~p
zB6<Kf!ApoHmSnIfLcn5>4w=L=-eALQlh@poVsRTlU4UZA82l8G)f_K2lav!%#RZ{S
z#tAnTq16m$6=^OR62f8xars>2C6l6KToS?Je%ob1wwdettrR&}!C?f!+MF>@0x=$}
z-;ZFI2BWUb5!fKEA8+@Yx)z+(rfI#wXL2Vvn^XDWk|BjYM@T&|U24f8g53WnV&2s>
n&pgvC-}SlHI&vCpN6A*J)xrP5`c1dH5WMb<s!ucb=ydiE$SLSr

delta 130
zcmey?B;NL0tf7Umg{g(Pg=GutgO$^TR<SBfPg}(*Gkwb{R;lTKSFy@Y_gM|(&RoqZ
zJ^jgQpqTC&AW^mkD0X-aP*!j)tK{@Z5V2q_Q0y&;uv!OH+`0~^?i`2^Uk@Y_*0V~m
UmS<#^q)s=eWzpQWfwfE!01YTHJ^%m!

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 66829e602dd097a0d7a9fff33bb7b047ba68c82c..22a9c6acf6d1ea1b30db7b831da3a1313083e58f 100644
GIT binary patch
delta 788
zcmZXSF;Ck-6vqWm6a<KkfuZ1F1W6U6+&K<`t{s{90_fsgj8$VtmqZ~Ov5}Bi89a2T
zSQwd*nA(Lez{<b}=veUq+V`%GxD?5Hvh3gc-~avZefz%hdb@IdF>^6{4^QK*t_n|u
z8aaY_2bKz2qU^D%#W=^(bgR}b^D6n{7@TG4Cvm$#^Q##s<-f*Y+r5GB%U;hA;2!q6
zSeo^s|IZk9N@3hd42phoMx|aWu(cFE*+Ze?Fb)iodnCAzX7&oOkwRs$E#g2b;_~0K
zunJ`KD21{eg~3VR?02!1yA3M)g~DkHI~zF7SA+9#X0KVb8WY=>2$fpVKpGH3EymC>
z_a^Dwpqu<Ig%2N1u0{#cnRR^8DgMCmHV3L3P3bX=yMde@P;<|8Y&VQeZ#pS`Gwww0
zHHGbYCEIl9TLQ}&RP01iHijE*mT|H(3A>Eo=14|SGMobc&-zOS<x-%ejHfU(Jaxs#
z8Jg}(5g8O&<uzI-a;|3^5$2DCDMpcUitB9?t`S=Zl+b&bSLblq?lV|FY(>I1W5Hqm
oJtY3wapKmQ<0ny~oZ(5>mj{;J>2%(I*B-AAVeR21gP%)(0kTillK=n!

delta 125
zcmeyojBoaQzJ?aY7N#xC7aFHCHZdzq4{c(WnZB@zS!(*rCT7{`X3aouV>7e#^fS#s
zF`*V95!C_|Th;=U{oKMVIo+z2S#oj^qtNt&t;}lE#oB;s<J*ABmV=1*Ai|=ZSz>xs
TJ2Ut6_zq^Z?YG;RXK(`mA51Je

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 5368b2956d88f1f8c109c0dd4b7fccd8706310dd..3c58d79c006a25c5beea279a242142bc7c8fcde4 100644
GIT binary patch
delta 807
zcmZXSzfK!L5XJ>|g1u=-;TE5LC>V5yylbETfKZeoU3dYywS7KLIqs~L!Er~iU67EV
zxRw{7L!zJri6_Vd&__zUN5#xy!xE&^>a_apH{X0Se{Y<-Tjy9V$VHixdHF$pluNQ8
zi&tbtt&T)^z{S+%)Z4N|(Bn0aIu>ONj!wg|HmSFsepbXy%Ze28$fe(Z7b|I75j)*c
zWa;_t_@r3MA-k){S|yB!i6Pl(Iu@gNH0v|TK#>i5!bKd$fk86QgTh@X+@66_k@f0;
z$AK?Qj)9N|SgSkZE)=QRQ5fuxO{@V3Yqao~gEwHXJmBJ|!FkZG*8w%~s5}0HUG$<u
z-+(A+Q3`b#7S`B5FlUGHAPmfQX&uwUqD}bG;HQjiR1d`{dLu|7>K1UiVa=^&P<Ir@
zra7IQo=Rgb_bnq|%EBKQ?%2CT_A)S+2#n6;&^%@6Za#}60IO3!ijv72@c&VqWu#UN
zgzv|Qr7t7DMAKuRN5*Tk%IdgE=v?=9k63@o_3PQPVWte@dfki%zzTujdMDG#DeT(f
zBU$;;i+JCR1>8S>D8B8waqpMgPohM)ll^e)Z&~(mIDCJvJ)SS;OF4L#R;-26_18yo
GX+Htfc;iz5

delta 148
zcmX?dSm(`dorV_17N!>F7M2#)7Pc1l7LFFqEnIRxrsw_O;+!7wgG+q+;vZZx)8GH#
zlA3P*lS_7b%TFNp{7)|F=~BOdVhJE(#V?@PmtR0x$KPC%(>p-K+224h$v;3M<quHt
n+CM;bUqOWJUm(%;mrH`ZJR`Ft)k<OdMhiBH?c)Eq)+z%47MeZ=

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index f7d3d7069..b1d4ef5f0 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -836,9 +836,11 @@ table tbody {
 }
 
 // Expose theme colors as variables. (Useful for dynamic styling of choices etc.)
+// Both as opaque colour and translucent (alpha 15%)
 :root {
   @each $color, $value in $theme-colors {
     --nbx-color-#{$color}: #{$value};
+    --nbx-color-#{$color}-a15: #{rgba($value, 0.15)};
   }
 }
 

From 95b705dac22f41498cfc81ffcfdfe005aadea888 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sat, 23 Sep 2023 23:07:16 +0200
Subject: [PATCH 4/9] Move DeviceInterfaceTable coloring logic into CSS

Preparatory work for simplifying toggle button code for cable status.
---
 netbox/dcim/tables/devices.py                | 11 ++---------
 netbox/templates/dcim/device/interfaces.html | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index fc8a3af73..063e05215 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -6,6 +6,7 @@ from dcim import models
 from netbox.tables import NetBoxTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from .template_code import *
+from dcim.choices import LinkStatusChoices
 
 __all__ = (
     'BaseInterfaceTable',
@@ -51,14 +52,6 @@ def get_cabletermination_row_class(record):
     return ''
 
 
-def get_interface_row_class(record):
-    if not record.enabled:
-        return 'danger'
-    elif record.is_virtual:
-        return 'primary'
-    return get_cabletermination_row_class(record)
-
-
 def get_interface_state_attribute(record):
     """
     Get interface enabled state as string to attach to <tr/> DOM element.
@@ -700,7 +693,6 @@ class DeviceInterfaceTable(InterfaceTable):
             'cable', 'connection',
         )
         row_attrs = {
-            'class': get_interface_row_class,
             'data-name': lambda record: record.name,
             'data-enabled': get_interface_state_attribute,
             'data-virtual': get_interface_virtual_attribute,
@@ -708,6 +700,7 @@ class DeviceInterfaceTable(InterfaceTable):
             'data-cable-status': get_interface_cable_status_attribute,
             'data-type': lambda record: record.type,
         }
+        cable_status_styles = [(slug, color) for slug, _, color in LinkStatusChoices.CHOICES]
 
 
 class FrontPortTable(ModularDeviceComponentTable, CableTerminationTable):
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 8b3fe3097..54682439c 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -30,3 +30,23 @@
         </div>
     {% endif %}
 {% endblock bulk_extra_controls %}
+
+{% block head %}
+    {{ block.super }}
+    <style>
+        {% for status, color in table.Meta.cable_status_styles %}
+        tr[data-cable-status={{ status }}] {
+            background-color: var(--nbx-color-{{ color }}-a15);
+        }
+        {% endfor %}
+        tr[data-mark-connected=true] {
+            background-color: var(--nbx-color-success-a15);
+        }
+        tr[data-virtual=true] {
+            background-color: var(--nbx-color-primary-a15);
+        }
+        tr[data-enabled=disabled] {
+            background-color: var(--nbx-color-danger-a15);
+        }
+    </style>
+{% endblock %} 

From 32035d2f287c27783a9573366066de08a1552124 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sat, 23 Sep 2023 23:45:08 +0200
Subject: [PATCH 5/9] Simplify mark connected/installed  implementation

Fixes: #13712 and #13806.
---
 netbox/project-static/dist/netbox.js          | Bin 530368 -> 529923 bytes
 netbox/project-static/dist/netbox.js.map      | Bin 450659 -> 450364 bytes
 .../src/buttons/connectionToggle.ts           |  36 +++++-------------
 netbox/templates/dcim/device/interfaces.html  |   9 ++++-
 .../dcim/inc/cable_toggle_buttons.html        |  15 +++-----
 5 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 84bfecae34920e732ecf52670208390ce6712040..d457ae229f71cfb090301054275a1d36b6ddfb16 100644
GIT binary patch
delta 15474
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

delta 15773
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
Iygcgv0oR~A9smFU

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 7f2400ed2610973ed909703e534ec9b73c19c8ae..51042c43167bdeace2fa7ed21428254800856a7e 100644
GIT binary patch
delta 181
zcmaESKzh$U>4p}@7N!>F7M3ln%<m-4oOIkB9ZkSwv6GIoV~D=1j=y8L>-3B7Smnf>
z&A~FhAVq;XiH?qmI+2d9S<@rmu^KWv7dTI!{EpRJ(%n(V)6vlrBA@T%=ve5a<Ll^K
z<~-f*1FNlkKG=+4kj^rY;f~=zSs($_qwS<qIeo$*Hp%G=?y|A*!c-<ZCsny_Z~4G_
G|2+ULxjFs-

delta 470
zcmZ{gy-LJT5QWj~UD@7lMSOrMHdv&xICnNmh#`a!C56SZ__L@hXxPGLE#d=M<wXP=
z5nsaE!an;7&b>(yTx>4GnRCy4Gw&b6pU>e_xlwMGPT6}^PJJ@cbOc;8G1wiOI-<Zl
zQYAD2CX|Estt)TD49F-2Qfc#ojhLDzC+Xy3_ZL-CD|c|=GR3&mQT1FaZ;L}2;vZK#
zwc1_!o{fx~$SE+TTMeEw0SH9pL&Fi6%uG@c(<%7geriSAPQW)-OghfoV4s5v3)gn6
zU3MvqeNUE)%!V@=dSwH`PQZh%UV8oQ<(-B<*MC7|<~oSbt%C@|W0$UFXy{~Dd*uH)
e9Jz@F>5nwxLRVk4IvC6}h3si>{C2id->YA7Q-uZq

diff --git a/netbox/project-static/src/buttons/connectionToggle.ts b/netbox/project-static/src/buttons/connectionToggle.ts
index 74b32dc3a..ed119f738 100644
--- a/netbox/project-static/src/buttons/connectionToggle.ts
+++ b/netbox/project-static/src/buttons/connectionToggle.ts
@@ -7,10 +7,10 @@ import { isTruthy, apiPatch, hasError, getElements } from '../util';
  *
  * @param element Connection Toggle Button Element
  */
-function toggleConnection(element: HTMLButtonElement): void {
+function setConnectionStatus(element: HTMLButtonElement, status: string): void {
+  // Get the button's row to change its data-cable-status attribute
+  const row = element.parentElement?.parentElement as HTMLTableRowElement;
   const url = element.getAttribute('data-url');
-  const connected = element.classList.contains('connected');
-  const status = connected ? 'planned' : 'connected';
 
   if (isTruthy(url)) {
     apiPatch(url, { status }).then(res => {
@@ -19,34 +19,18 @@ function toggleConnection(element: HTMLButtonElement): void {
         createToast('danger', 'Error', res.error).show();
         return;
       } else {
-        // Get the button's row to change its styles.
-        const row = element.parentElement?.parentElement as HTMLTableRowElement;
-        // Get the button's icon to change its CSS class.
-        const icon = element.querySelector('i.mdi, span.mdi') as HTMLSpanElement;
-        if (connected) {
-          row.classList.remove('success');
-          row.classList.add('info');
-          element.classList.remove('connected', 'btn-warning');
-          element.classList.add('btn-info');
-          element.title = 'Mark Installed';
-          icon.classList.remove('mdi-lan-disconnect');
-          icon.classList.add('mdi-lan-connect');
-        } else {
-          row.classList.remove('info');
-          row.classList.add('success');
-          element.classList.remove('btn-success');
-          element.classList.add('connected', 'btn-warning');
-          element.title = 'Mark Installed';
-          icon.classList.remove('mdi-lan-connect');
-          icon.classList.add('mdi-lan-disconnect');
-        }
+        // Update cable status in DOM
+        row.setAttribute('data-cable-status', status);
       }
     });
   }
 }
 
 export function initConnectionToggle(): void {
-  for (const element of getElements<HTMLButtonElement>('button.cable-toggle')) {
-    element.addEventListener('click', () => toggleConnection(element));
+  for (const element of getElements<HTMLButtonElement>('button.mark-planned')) {
+    element.addEventListener('click', () => setConnectionStatus(element, 'planned'));
+  }
+  for (const element of getElements<HTMLButtonElement>('button.mark-installed')) {
+    element.addEventListener('click', () => setConnectionStatus(element, 'connected'));
   }
 }
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 54682439c..c4aee9784 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -48,5 +48,12 @@
         tr[data-enabled=disabled] {
             background-color: var(--nbx-color-danger-a15);
         }
-    </style>
+        tr[data-cable-status=connected] button.mark-installed {
+            display: none;
+        }
+        tr:not([data-cable-status=connected]) button.mark-planned {
+            display: none;
+        }
+
+</style>
 {% endblock %} 
diff --git a/netbox/templates/dcim/inc/cable_toggle_buttons.html b/netbox/templates/dcim/inc/cable_toggle_buttons.html
index 4d8d995c4..1c5427337 100644
--- a/netbox/templates/dcim/inc/cable_toggle_buttons.html
+++ b/netbox/templates/dcim/inc/cable_toggle_buttons.html
@@ -1,12 +1,9 @@
 {% load i18n %}
 {% if perms.dcim.change_cable %}
-    {% if cable.status == 'connected' %}
-        <button type="button" class="btn btn-warning btn-sm cable-toggle connected" title="{% trans "Mark Planned" %}" data-url="{% url 'dcim-api:cable-detail' pk=cable.pk %}">
-            <i class="mdi mdi-lan-disconnect" aria-hidden="true"></i>
-        </button>
-    {% else %}
-        <button type="button" class="btn btn-info btn-sm cable-toggle" title="{% trans "Mark Installed" %}" data-url="{% url 'dcim-api:cable-detail' pk=cable.pk %}">
-            <i class="mdi mdi-lan-connect" aria-hidden="true"></i>
-        </button>
-    {% endif %}
+    <button type="button" class="btn btn-warning btn-sm mark-planned" title="{% trans "Mark Planned" %}" data-url="{% url 'dcim-api:cable-detail' pk=cable.pk %}">
+    <i class="mdi mdi-lan-disconnect" aria-hidden="true"></i>
+    </button>
+    <button type="button" class="btn btn-info btn-sm mark-installed" title="{% trans "Mark Installed" %}" data-url="{% url 'dcim-api:cable-detail' pk=cable.pk %}">
+    <i class="mdi mdi-lan-connect" aria-hidden="true"></i>
+    </button>
 {% endif %}

From 6a6e44dca9796536aaea2d6cfaaf12671f300601 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Sun, 24 Sep 2023 00:08:39 +0200
Subject: [PATCH 6/9] Fix formatting

---
 netbox/templates/dcim/device/interfaces.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index c4aee9784..8669789c7 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -35,9 +35,9 @@
     {{ block.super }}
     <style>
         {% for status, color in table.Meta.cable_status_styles %}
-        tr[data-cable-status={{ status }}] {
-            background-color: var(--nbx-color-{{ color }}-a15);
-        }
+            tr[data-cable-status={{ status }}] {
+                background-color: var(--nbx-color-{{ color }}-a15);
+            }
         {% endfor %}
         tr[data-mark-connected=true] {
             background-color: var(--nbx-color-success-a15);
@@ -54,6 +54,5 @@
         tr:not([data-cable-status=connected]) button.mark-planned {
             display: none;
         }
-
-</style>
+    </style>
 {% endblock %} 

From cd523f531104784b5bbd3f988daf377950399f3a Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Tue, 23 Jan 2024 20:49:10 +0100
Subject: [PATCH 7/9] Refactor noisy getter methods into neat lambdas

---
 netbox/dcim/tables/devices.py | 48 +++--------------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 063e05215..fcacd886a 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -52,46 +52,6 @@ def get_cabletermination_row_class(record):
     return ''
 
 
-def get_interface_state_attribute(record):
-    """
-    Get interface enabled state as string to attach to <tr/> DOM element.
-    """
-    if record.enabled:
-        return "enabled"
-    else:
-        return "disabled"
-
-
-def get_interface_virtual_attribute(record):
-    """
-    Get interface virtual state as string to attach to <tr/> DOM element.
-    """
-    if record.is_virtual:
-        return "true"
-    else:
-        return "false"
-
-
-def get_interface_mark_connected_attribute(record):
-    """
-    Get interface enabled state as string to attach to <tr/> DOM element.
-    """
-    if record.mark_connected:
-        return "true"
-    else:
-        return "false"
-
-
-def get_interface_cable_status_attribute(record):
-    """
-    Get interface enabled state as string to attach to <tr/> DOM element.
-    """
-    if record.cable:
-        return record.cable.status
-    else:
-        return ""
-
-
 #
 # Device roles
 #
@@ -694,10 +654,10 @@ class DeviceInterfaceTable(InterfaceTable):
         )
         row_attrs = {
             'data-name': lambda record: record.name,
-            'data-enabled': get_interface_state_attribute,
-            'data-virtual': get_interface_virtual_attribute,
-            'data-mark-connected': get_interface_mark_connected_attribute,
-            'data-cable-status': get_interface_cable_status_attribute,
+            'data-enabled': lambda record: "enabled" if record.enabled else "disabled",
+            'data-virtual': lambda record: "true" if record.is_virtual else "false",
+            'data-mark-connected': lambda record: "true" if record.mark_connected else "false",
+            'data-cable-status': lambda record: record.cable.status if record.cable else "",
             'data-type': lambda record: record.type,
         }
         cable_status_styles = [(slug, color) for slug, _, color in LinkStatusChoices.CHOICES]

From cf6fd306d9c2921c28da2894c84769f0f11c90f2 Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Tue, 23 Jan 2024 20:58:10 +0100
Subject: [PATCH 8/9] Hardcode cable status colours

---
 netbox/dcim/tables/devices.py                |  2 --
 netbox/templates/dcim/device/interfaces.html | 14 +++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index fcacd886a..d15cfe64d 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -6,7 +6,6 @@ from dcim import models
 from netbox.tables import NetBoxTable, columns
 from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 from .template_code import *
-from dcim.choices import LinkStatusChoices
 
 __all__ = (
     'BaseInterfaceTable',
@@ -660,7 +659,6 @@ class DeviceInterfaceTable(InterfaceTable):
             'data-cable-status': lambda record: record.cable.status if record.cable else "",
             'data-type': lambda record: record.type,
         }
-        cable_status_styles = [(slug, color) for slug, _, color in LinkStatusChoices.CHOICES]
 
 
 class FrontPortTable(ModularDeviceComponentTable, CableTerminationTable):
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 8669789c7..9860d74ef 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -34,11 +34,15 @@
 {% block head %}
     {{ block.super }}
     <style>
-        {% for status, color in table.Meta.cable_status_styles %}
-            tr[data-cable-status={{ status }}] {
-                background-color: var(--nbx-color-{{ color }}-a15);
-            }
-        {% endfor %}
+        tr[data-cable-status=connected] {
+            background-color: var(--nbx-color-green-a15);
+        }
+        tr[data-cable-status=planned] {
+            background-color: var(--nbx-color-blue-a15);
+        }
+        tr[data-cable-status=decommissioning] {
+            background-color: var(--nbx-color-yellow-a15);
+        }
         tr[data-mark-connected=true] {
             background-color: var(--nbx-color-success-a15);
         }

From fd9cd3a1d62546814dbce8b703644e0cddbcb37c Mon Sep 17 00:00:00 2001
From: Per von Zweigbergk <pvz@pvz.pp.se>
Date: Tue, 23 Jan 2024 21:33:09 +0100
Subject: [PATCH 9/9] Move interface colour logic into SCSS where it belongs

---
 netbox/project-static/dist/netbox-dark.css   | Bin 377206 -> 376700 bytes
 netbox/project-static/dist/netbox-light.css  | Bin 234355 -> 233635 bytes
 netbox/project-static/dist/netbox-print.css  | Bin 729540 -> 730610 bytes
 netbox/project-static/styles/netbox.scss     |  48 +++++++++++++++----
 netbox/templates/dcim/device/interfaces.html |  30 ------------
 5 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 3032fe467ea47d59c64340686dd42ea368d0ac99..78799839ed87a890969704f64cd09995c0e0962c 100644
GIT binary patch
delta 599
zcmey?B>v~0SVIeA3sVbo3(FSPjVrfpU@aA#{{9i8()6?YS)~k9Qp+-vQ{yx9N>Yo`
z5|dMlV--q@qEiw}5_OXklX6mZi%SwqN{eli^YijjlS@)lCU00SGW~!!BinSwzl^G2
zLkx&Dq#!2|Xi7@#^of<sk_i14#OhB;P0r8F%`7g?%+JfrOOKuYaS^NZbmqT|%3ycs
z;V~ySu_#*??g`tHqS90>KGDEqLRn@}NoisZSSz{@wDIUm%>#vFifu|}F_;0iRzMv&
z06p+%#~ur@3Q46UCHZ-JV1H%i0b?l#Xvy@4j~ETWVG)hhNUOa35)FK@8>@+8Ff_ud
Pfo=yfD}mbcQfs*YGr8)W

delta 1500
zcmai!O^ee&7{}?_dJqLg=z6S(pwf}dq<QJ?LH!Ei7no#bvcZ^?w59f9M0(%D9&+_0
z>`@T*><5y?izgAEXVS7WCT<~ww14LJy#D9+pW&}hhaWe+&B5lzrvGj5^}N3GqksEN
zTx3N_W@Y-0m+Pa^BVY1R$zwwD=smGS!l`#ODwBvmq0||Vs2`3;%$tly&#Cv+JaP7+
zH$1#LKbLWl3&10xe)hBfuxh~bWgN@-9HItZ6ih>tLAIh5HGrt03onngqmndNg|0v-
z<y$ONOi+dSGX^9!@jFN>Ugl|@08A;teQv?FqQPUH2P6vZpiUP~@H~+v(4e<|sE)}i
zqq~i0(p+dM)vpO;_-}JbmL?~Q`txOf_*#FOM;Y{mG01_rP+{vR4B;)L!A0an!YT?C
z1exQBvZd7hY;6Q8M%X>;0D}=}f}`PX;Hba~+-N4ucPpr$VkHw8c&munvYcg@7@vkx
z*t2Ogi#7$=1YtOzHZ0AtBhnAO$lE1WHJ$*;AnA@$7q>5@9i&nU1Z^j53>X9pbNzIS
zlIK-|<tZ7lfbDY9DWRB{o!9oG0d5}cFd|vYEGt$BYwvNRnW^p8xcbi?C#94*z&hNj
zC4)uj^<G^_o*`)}R7|ZJL8&s6#Gu>St906Bhj`5~CttQ)kBSM}WBR1zcmWD2>o1r6
zyA}R6j<Y@9iZUMKDmjj0)uaD6IN;0XY3<_bBwgsiE4U)a{i_R93y3&7J$+Dre{t}*
QeklewFD}jp#l7CGzmD0!lK=n!

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index 22a9c6acf6d1ea1b30db7b831da3a1313083e58f..15d65dc5092022f0196bbadde59e280d4a63fe7e 100644
GIT binary patch
delta 614
zcmeyojBoKmzJ?aY7N#xC3mc~&sAp!Ip4P!Ezx{SQ^K|a%29ubj3{z6eGLuu|GxJJP
zi_#L4Q;TC2N{XUW5=#<wlM|D2Qgw?<5=%;pZIko!@=}vaQd6cEyk-=c{9rj7vyoXX
z*bIGQ%_zu81R4T1L3Hx`QdYPL7Q~v6lA4^Ko10l&oSC1OnU@|r{h~IL$Yh7p2&44y
z7?qn?l&uT*h;2zxX)2~~)bSWlmRVF%nwW#6bHPGHIB4V1nVJU*%oN*{%wjMDV(<M8
z2;E_LbYqW+ScRn0l9K#9J+Qwr^MEmx1GJ+WXa_K)E3NYK^HL!(6phtvpn?(&d{G^%
NiDCmZ`cTd10sx!X>7)Pv

delta 1470
zcmZ{k!H&}~6h+mE*nk+25DRu0u>q+;u^lH(`2{w7f@3?GFd?bjR;6MQMw%7dS<IFZ
z5?_GCijPA40Pn>W*c~HPQI)HlT)%r?zTTex{&xE5YIb$<J-WRdmu46?ACsi7J|uGJ
z29vBz`(Bv+GJeijA*$kaKuiST%h)uPc)`g$CX~Wu!RGNR!e4q1thF3^WqG+Qc%eM`
z;a?q*H=k$G*=TL7w^Hi$8f=hqQSi)r>>xTeC<g}&E{iPSqV4MeNIX+{oq8lx91J`?
z#*_eqW@!Ml6Q*zb23U11N$L;hAUZh8(N+nADFQGh`bHaIDam-o556AT^ILJ6%CD2?
z>3BTYu5HdY@T@Mi)U|h}Npf8<FhE(3mon(XTmXq>Ol1CaAh-()8g1B+GhfW(JT&C0
z+iJk1D%Z82GAfQA0(J<2@lqbDOxvrr!MO6Aq&2li8xQTYq6<s0dw8}C{@m%`YHL;<
z+RE#UO5)AQYA%aFnR8%Gk@>7?HQF8rrE<m=ej!(&IH0LP(`K-cDWer)+|+I8ARy%i
z6MuA+`1RY_lkwl04hGxfz7vN@C{7~O+`aC)VF#}b6xV7VE8N?|ZZ<~i9#DbJoFtC~
zrvAH^8!bBE&{USCze}h%7#t%_$p|nUs~-(~wB%l(p;Sq6wBV>XAnYE+%7pj3F#^AQ
zLRGx-JB&&aVL0=9(b+qjSJerLjYv~}Z>IasTOknpyJLKJ-fpm-b?xu)bblgTzlomx
M_;MNjd@#HJ2TP{4>;M1&

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 3c58d79c006a25c5beea279a242142bc7c8fcde4..bfa625b945cec27013590a409d98935faede0b5f 100644
GIT binary patch
delta 1629
zcmX?dSm)DeorV_17N!>F7M2#)7Pc1l7LFFqEnM@yZx{c^wOV=lc^Phb!<5vr%;ePg
z%)FA+qO`>1)Z$o$lA`F8#F9ka<iw<$RNdl|#FElt+vNPbywv29)RgH9YdKY>E68(8
zk)iit5~J$$eX`tAMkL!CJAI=9x5)JV8BDCqMrO5O*Xt8&N<mH{(D_JiCs`-l<pw0$
z89QC@Kbz<@J7yNRv(1S$A|*9BKQ}kCxHvOEFEcM45%gr60QZIknQn-k9{7n%WO~A1
zHbgY&;xQ{Xu_#*?o_K6aib^Lx6jcSMAJVi<542=d1E(E)affMLDz=29hR4NanMEa~
zi8&}vB~m@YjT*#R0CZgAZ#LoS556+8!IOtF9=)k~piG%!JN<$nrw%w2iB+vO`2h<%
zIQ(>oFh3=;7;F*PeIgvm#-=8wuw3VgM?dy5BUT})w4@|IPY)bDnR&o6C1<+he_(uq
z$`R_AH~C<YI@o(*RB;|KkgI`#04z8vt@85oQXvJ77gn=@3Q9Eam6@@cC;<R2jV4bF
Zf@A|KnmOHZ5fdbj#8A(n=mAm71pozKV^{zH

delta 1494
zcmaKsF>ljA6vvge0h|d5A~Cw^5~R4gJNultjC_s`XW!X17&~$jg$&3YJOL6y9Wo&G
z3$P+FBiQ&dh@~s<*--9ct5Reo{_Fkn{_p+oe*c{Q_&&X?2lYXHSRd8H`d)p%eo$Lq
zM%OpHPj9XBVN_&A`SI7|Di2>f%@1c$rmsY~bp+*ScA11?!s*nejKO2>PVH05pFVS(
z{{>4G6}g0xGyBAkW_%|5WsOM59B6cgT#m@y`8&%xZ5vpwqev~6K%>EY#yykPipbhs
zzPHBJem7|z7f{MQ>Bqz<MMdjj?oDk*@!^pkR~u30X`TQojw4ED2I{W}wCdlG7zZOX
zfB}K4&WxnU6IB9CMlScb0c$m_Gsd7H4kSP5L1k%ju>z6`RHWj{KsB09a)H8JA0K@z
z*xE}#xt=RLb6BWoAP(E-urnX#WtgiVKTepf6<~<;RctOF6%9k79ZJC+Lwg1YIcYA_
z1h?n=l*G)i)@nM7U?QKOHxIt;!>+y!9_guGmy673g+i)*sBU()U+pZ?948}v*PWXQ
zL`7?(iBNMw+)fu2cq)}dPIv7f=$JcqUX++0;KXvKsM$}e=_s5nWnisBXvf-CWm&O7
zSU1?MX29->by6yo1F7erqBP8r)PGJ_N@P&UNE8I-;X+000LRJ*UO_nJj+<yJumd6^
zv3K54x#c_;6AT~2(DWbpq!f6A2^sRx3^6K=k<AC|_(gk3g_(#jAcUCbrg?w+uVMlV
pXg{6CHy7!uS!o;_L2uqSgsX=~<3p(19ovKP*Xx_n=aYjsqd!z_y|(}W

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index b1d4ef5f0..aee9d0bdb 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -835,15 +835,6 @@ table tbody {
   }
 }
 
-// Expose theme colors as variables. (Useful for dynamic styling of choices etc.)
-// Both as opaque colour and translucent (alpha 15%)
-:root {
-  @each $color, $value in $theme-colors {
-    --nbx-color-#{$color}: #{$value};
-    --nbx-color-#{$color}-a15: #{rgba($value, 0.15)};
-  }
-}
-
 // Style objects with statuses/roles within a table. As of implementation, used for IP addresses
 // assigned to interfaces.
 table .table-badge-group {
@@ -1078,4 +1069,41 @@ html {
       display: none;
     }
   }
-}
+  
+  // Apply row colours to interface lists
+  &[data-netbox-url-name='device_interfaces'] {
+    tr[data-cable-status=connected] {
+      background-color: rgba(map.get($theme-colors, "green"), 0.15);
+    }
+  
+    tr[data-cable-status=planned] {
+      background-color: rgba(map.get($theme-colors, "blue"), 0.15);
+    }
+  
+    tr[data-cable-status=decommissioning] {
+      background-color: rgba(map.get($theme-colors, "yellow"), 0.15);
+    }
+  
+    tr[data-mark-connected=true] {
+      background-color: rgba(map.get($theme-colors, "success"), 0.15);
+    }
+  
+    tr[data-virtual=true] {
+      background-color: rgba(map.get($theme-colors, "primary"), 0.15);
+    }
+  
+    tr[data-enabled=disabled] {
+      background-color: rgba(map.get($theme-colors, "danger"), 0.15);
+    }
+  
+    // Only show the correct button depending on the cable status
+    tr[data-cable-status=connected] button.mark-installed {
+      display: none;
+    }
+  
+    tr:not([data-cable-status=connected]) button.mark-planned {
+      display: none;
+    }
+  
+  }
+}
\ No newline at end of file
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 9860d74ef..8b3fe3097 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -30,33 +30,3 @@
         </div>
     {% endif %}
 {% endblock bulk_extra_controls %}
-
-{% block head %}
-    {{ block.super }}
-    <style>
-        tr[data-cable-status=connected] {
-            background-color: var(--nbx-color-green-a15);
-        }
-        tr[data-cable-status=planned] {
-            background-color: var(--nbx-color-blue-a15);
-        }
-        tr[data-cable-status=decommissioning] {
-            background-color: var(--nbx-color-yellow-a15);
-        }
-        tr[data-mark-connected=true] {
-            background-color: var(--nbx-color-success-a15);
-        }
-        tr[data-virtual=true] {
-            background-color: var(--nbx-color-primary-a15);
-        }
-        tr[data-enabled=disabled] {
-            background-color: var(--nbx-color-danger-a15);
-        }
-        tr[data-cable-status=connected] button.mark-installed {
-            display: none;
-        }
-        tr:not([data-cable-status=connected]) button.mark-planned {
-            display: none;
-        }
-    </style>
-{% endblock %}