From f3bef47887f22b955d7163034d9e5c90d20c4db0 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Fri, 5 May 2023 21:55:02 +0530
Subject: [PATCH 1/5] adds tooltip on custom field #12131

---
 netbox/templates/inc/panels/custom_fields.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 45843eea5a6..1d69e4cd20c 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -12,11 +12,14 @@ <h6>{{ group_name }}</h6>
           <table class="table table-hover attr-table">
             {% for field, value in fields.items %}
               <tr>
-                <th scope="row">
-                  <span title="{{ field.description|escape }}">{{ field }}</span>
-                </th>
                 <td>
                   {% customfield_value field value %}
+                    <i
+                      class="mdi mdi-information text-primary"
+                      data-bs-toggle="tooltip"
+                      data-bs-placement="right"
+                      title="{{ field.description }}"
+                    ></i>
                 </td>
               </tr>
             {% endfor %}

From 36cc08c25ec9735dfb9ec413789492b21aa4e2d8 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Fri, 5 May 2023 21:56:49 +0530
Subject: [PATCH 2/5] adds description field check

---
 netbox/templates/inc/panels/custom_fields.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 1d69e4cd20c..8ce6da7e6d3 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -14,12 +14,14 @@ <h6>{{ group_name }}</h6>
               <tr>
                 <td>
                   {% customfield_value field value %}
+                    {% if field.description %}
                     <i
                       class="mdi mdi-information text-primary"
                       data-bs-toggle="tooltip"
                       data-bs-placement="right"
                       title="{{ field.description }}"
                     ></i>
+                    {% endif %}
                 </td>
               </tr>
             {% endfor %}

From 8ec467cd43c8cc604321ae969ff55fc4e7415532 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Sat, 6 May 2023 19:35:21 +0530
Subject: [PATCH 3/5] fixed field name

---
 netbox/templates/inc/panels/custom_fields.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 8ce6da7e6d3..de303f92ac5 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -12,16 +12,18 @@ <h6>{{ group_name }}</h6>
           <table class="table table-hover attr-table">
             {% for field, value in fields.items %}
               <tr>
-                <td>
-                  {% customfield_value field value %}
-                    {% if field.description %}
+                <th scope="row">{{ field }}
+                  {% if field.description %}
                     <i
                       class="mdi mdi-information text-primary"
                       data-bs-toggle="tooltip"
                       data-bs-placement="right"
                       title="{{ field.description }}"
                     ></i>
-                    {% endif %}
+                  {% endif %}
+                </th>
+                <td>
+                  {% customfield_value field value %}
                 </td>
               </tr>
             {% endfor %}

From 6b3d15d50596fc5ff1a9b6efcac55292ec5701c8 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Sat, 6 May 2023 19:35:37 +0530
Subject: [PATCH 4/5] updated code to match the panel

---
 .../templates/circuits/inc/circuit_termination.html | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 22c204afca7..92e2c06c577 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -132,9 +132,16 @@ <h5>Termination {{ side }}</h5>
             </tr>
             {% for field, value in fields.items %}
               <tr>
-                <td>
-                  <span title="{{ field.description|escape }}">{{ field }}</span>
-                </td>
+                <th scope="row">{{ field }}
+                  {% if field.description %}
+                    <i
+                      class="mdi mdi-information text-primary"
+                      data-bs-toggle="tooltip"
+                      data-bs-placement="right"
+                      title="{{ field.description }}"
+                    ></i>
+                 {% endif %}
+                </th>
                 <td>
                   {% customfield_value field value %}
                 </td>

From 91559b25994d0eceb3918b6f4bcdc981131d173d Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Mon, 8 May 2023 19:05:00 +0530
Subject: [PATCH 5/5] added escape filter on description

---
 netbox/templates/circuits/inc/circuit_termination.html | 2 +-
 netbox/templates/inc/panels/custom_fields.html         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 92e2c06c577..b26a0920515 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -138,7 +138,7 @@ <h5>Termination {{ side }}</h5>
                       class="mdi mdi-information text-primary"
                       data-bs-toggle="tooltip"
                       data-bs-placement="right"
-                      title="{{ field.description }}"
+                      title="{{ field.description|escape }}"
                     ></i>
                  {% endif %}
                 </th>
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index de303f92ac5..7f5f4cc2785 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -18,7 +18,7 @@ <h6>{{ group_name }}</h6>
                       class="mdi mdi-information text-primary"
                       data-bs-toggle="tooltip"
                       data-bs-placement="right"
-                      title="{{ field.description }}"
+                      title="{{ field.description|escape }}"
                     ></i>
                   {% endif %}
                 </th>