From 41f653c9ae5652641a98464ea0c6c801dc3ec541 Mon Sep 17 00:00:00 2001
From: Gary Snider <75227981+gsnider2195@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:58:53 -0700
Subject: [PATCH] Fixed improperly rendered panels in device, location, and
 tenant views (#808)

---
 changes/743.fixed                             |   1 +
 .../content_template.html                     | 196 +++++++++---------
 2 files changed, 96 insertions(+), 101 deletions(-)
 create mode 100644 changes/743.fixed

diff --git a/changes/743.fixed b/changes/743.fixed
new file mode 100644
index 00000000..263d7e8a
--- /dev/null
+++ b/changes/743.fixed
@@ -0,0 +1 @@
+Fixed improperly rendered panels in device and location views.
diff --git a/nautobot_golden_config/templates/nautobot_golden_config/content_template.html b/nautobot_golden_config/templates/nautobot_golden_config/content_template.html
index 813f31aa..7ebd6fbe 100644
--- a/nautobot_golden_config/templates/nautobot_golden_config/content_template.html
+++ b/nautobot_golden_config/templates/nautobot_golden_config/content_template.html
@@ -6,119 +6,113 @@
           <strong>Config Compliance Validation</strong>
         </a>
       </div>
-      <div class="panel panel-default">
-        <table class="table table-hover panel-body report">
-          <thead>
-            <tr class="table-headings">
-              <th>Feature</th>
-              <th>Compliance</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for item in compliance %}
-              <tr>
-                <td>{{ item.rule__feature__name }}</td>
-                <td>
-                  {% if item.compliance == False %}
-                    <span class="label label-danger">Non-Compliant</span>
-                  {% elif item.compliance == True %}
-                    <span class="label label-success">Compliant</span>
-                  {% else %}
-                    <span class="label label-info">N/A</span>
-                  {% endif %}
-                </td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    {% elif template_type == 'location' %}
-      <div class="panel panel-default">
-        <table class="table table-hover panel-body report">
-          <thead>
-            <tr class="table-headings">
-              <th>Feature</th>
-              <th>Non-compliant</th>
-              <th>Compliant</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for item in compliance %}
-              <tr>
-                <td>{{ item.rule__feature__name }}</td>
-                <td><span class="label label-danger">{{ item.non_compliant }}</span></td>
-                <td><span class="label label-success">{{ item.compliant }}</span></td>
-              </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-      </div>
-    {% endif %}
-  </div>
-{% endif %}
-{# The panel will not show up, since it is returned early in template_content.py based on an actual GoldenConfig object existing #}
-{% if template_type == "device-configs" %}
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <strong>Configuration Types</strong>
-    </div>
-    <div class="panel panel-default">
-      <table class="table table-hover panel-body report">
+      <table class="table table-hover panel-body">
         <thead>
           <tr class="table-headings">
-            <th>Type</th>
-            <th>Config</th>
+            <th>Feature</th>
+            <th>Compliance</th>
           </tr>
         </thead>
         <tbody>
-          {% if config_features.compliance and golden_config.compliance_config %}
-            <tr>
-              <td>Compliance</td>
-              <td>
-                <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_compliance' pk=device.pk %}">
-                  <i class="mdi mdi-file-compare"></i>
-                </a>
-              </td>
-            </tr>
-          {% endif %} {% if config_features.intended and golden_config.intended_config %}
-            <tr>
-              <td>Intended</td>
-              <td>
-                <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_intended' pk=device.pk %}">
-                  <i class="mdi mdi-text-box-check-outline"></i>
-                </a>
-              </td>
-            </tr>
-          {% endif %} {% if config_features.postprocessing and golden_config.intended_config %}
-            <tr>
-              <td>Configuration Postprocessing</td>
-              <td>
-                <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_postprocessing' pk=device.pk %}">
-                  <i class="mdi mdi-text-box-check"></i>
-                </a>
-              </td>
-            </tr>
-          {% endif %} {% if config_features.backup and golden_config.backup_config %}
+          {% for item in compliance %}
             <tr>
-              <td>Actual</td>
+              <td>{{ item.rule__feature__name }}</td>
               <td>
-                <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_backup' pk=device.pk %}">
-                  <i class="mdi mdi-file-document-outline"></i>
-                </a>
+                {% if item.compliance == False %}
+                  <span class="label label-danger">Non-Compliant</span>
+                {% elif item.compliance == True %}
+                  <span class="label label-success">Compliant</span>
+                {% else %}
+                  <span class="label label-info">N/A</span>
+                {% endif %}
               </td>
             </tr>
-          {% endif %} {% if config_features.sotagg %}
+          {% endfor %}
+        </tbody>
+      </table>
+    {% elif template_type == 'location' %}
+      <table class="table table-hover panel-body">
+        <thead>
+          <tr class="table-headings">
+            <th>Feature</th>
+            <th>Non-compliant</th>
+            <th>Compliant</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for item in compliance %}
             <tr>
-              <td>SoT Aggregation Data</td>
-              <td>
-                <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_sotagg' pk=device.pk %}">
-                  <i class="mdi mdi-code-json"></i>
-                </a>
-              </td>
+              <td>{{ item.rule__feature__name }}</td>
+              <td><span class="label label-danger">{{ item.non_compliant }}</span></td>
+              <td><span class="label label-success">{{ item.compliant }}</span></td>
             </tr>
-          {% endif %}
+          {% endfor %}
         </tbody>
       </table>
+    {% endif %}
+  </div>
+{% endif %}
+{# The panel will not show up, since it is returned early in template_content.py based on an actual GoldenConfig object existing #}
+{% if template_type == "device-configs" %}
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <strong>Configuration Types</strong>
     </div>
+    <table class="table table-hover panel-body">
+      <thead>
+        <tr class="table-headings">
+          <th>Type</th>
+          <th>Config</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% if config_features.compliance and golden_config.compliance_config %}
+          <tr>
+            <td>Compliance</td>
+            <td>
+              <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_compliance' pk=device.pk %}">
+                <i class="mdi mdi-file-compare"></i>
+              </a>
+            </td>
+          </tr>
+        {% endif %} {% if config_features.intended and golden_config.intended_config %}
+          <tr>
+            <td>Intended</td>
+            <td>
+              <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_intended' pk=device.pk %}">
+                <i class="mdi mdi-text-box-check-outline"></i>
+              </a>
+            </td>
+          </tr>
+        {% endif %} {% if config_features.postprocessing and golden_config.intended_config %}
+          <tr>
+            <td>Configuration Postprocessing</td>
+            <td>
+              <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_postprocessing' pk=device.pk %}">
+                <i class="mdi mdi-text-box-check"></i>
+              </a>
+            </td>
+          </tr>
+        {% endif %} {% if config_features.backup and golden_config.backup_config %}
+          <tr>
+            <td>Actual</td>
+            <td>
+              <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_backup' pk=device.pk %}">
+                <i class="mdi mdi-file-document-outline"></i>
+              </a>
+            </td>
+          </tr>
+        {% endif %} {% if config_features.sotagg %}
+          <tr>
+            <td>SoT Aggregation Data</td>
+            <td>
+              <a href="{% url 'plugins:nautobot_golden_config:goldenconfig_sotagg' pk=device.pk %}">
+                <i class="mdi mdi-code-json"></i>
+              </a>
+            </td>
+          </tr>
+        {% endif %}
+      </tbody>
+    </table>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}