From 6d328a82e9dac52821bba08841caa2e1188c310c Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 16 Aug 2022 10:04:47 -0400
Subject: [PATCH] Cleanup for #9505

---
 netbox/templates/ipam/prefix.html | 95 +++++++++++++------------------
 1 file changed, 40 insertions(+), 55 deletions(-)

diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index ed2c3339b..b15aa60bb 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -144,15 +144,14 @@
             </td>
           </tr>
         </table>
+        {% if object.prefix.version == 4 %}
+          <div class="float-end">
+            <a class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#prefix-modal">
+              <i class="mdi mdi-information-outline" aria-hidden="true"></i> Addressing Details
+            </a>
+          </div>
+        {% endif %}
       </div>
-      {% if object.prefix.version == 4 %}
-      <div class="card-footer text-end noprint">
-        <a class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#prefix-modal">
-          <i class="mdi mdi-details" aria-hidden="true"></i>
-                    Details
-        </a>
-      </div>
-      {% endif %}
     </div>
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/tags.html' %}
@@ -168,54 +167,40 @@
         {% plugin_full_width_page object %}
     </div>
 </div>
-{% if object.prefix.version == 4 %}
-  <div class="modal fade" id="prefix-modal" tabindex="-1" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">Prefix Details</h5>
-        </div>
-        <div class="modal-body">
-          <table class="table table-hover attr-table">
-            <tr>
-              <td>
-                Network Mask
-              </td>
-              <td>
-                {{ object.prefix.netmask }}
-              </td>
-            </tr>
-            <tr>
-              <td>
-                Wildcard Mask
-              </td>
-              <td>
-                {{ object.prefix.hostmask }}
-              </td>
-            </tr>
-            <tr>
-              <td>
-                Network Address
-              </td>
-              <td>
-                {{ object.prefix.network }}
-              </td>
-            </tr>
-            <tr>
-              <td>
-                Broadcast Address
-              </td>
-              <td>
-                {{ object.prefix.broadcast }}
-              </td>
-            </tr>
-          </table>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
+{% endblock %}
+
+{% block modals %}
+  {{ block.super }}
+  {% if object.prefix.version == 4 %}
+    <div class="modal fade" id="prefix-modal" tabindex="-1" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">Prefix Details</h5>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+          </div>
+          <div class="modal-body">
+            <table class="table table-hover attr-table">
+              <tr>
+                <td>Network Address</td>
+                <td>{{ object.prefix.network }}</td>
+              </tr>
+              <tr>
+                <td>Network Mask</td>
+                <td>{{ object.prefix.netmask }}</td>
+              </tr>
+              <tr>
+                <td>Wildcard Mask</td>
+                <td>{{ object.prefix.hostmask }}</td>
+              </tr>
+              <tr>
+                <td>Broadcast Address</td>
+                <td>{{ object.prefix.broadcast }}</td>
+              </tr>
+            </table>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-{% endif %}
+  {% endif %}
 {% endblock %}