From 99925720f91cd63b687d0bcbd24493799614701c Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 18 Oct 2022 16:51:37 -0400
Subject: [PATCH] Closes #10685: Position A/Z termination cards above the fold
 under circuit view

---
 docs/release-notes/version-3.3.md      |  5 ++++-
 netbox/templates/circuits/circuit.html | 12 +++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md
index 2c84ad2d6..b341a0207 100644
--- a/docs/release-notes/version-3.3.md
+++ b/docs/release-notes/version-3.3.md
@@ -5,12 +5,15 @@
 ### Enhancements
 
 * [#9722](https://github.com/netbox-community/netbox/issues/9722) - Add LDAP configuration parameters to specify certificates
+* [#10685](https://github.com/netbox-community/netbox/issues/10685) - Position A/Z termination cards above the fold under circuit view
 
 ### Bug Fixes
 
 * [#9669](https://github.com/netbox-community/netbox/issues/9669) - Strip colons from usernames when using remote authentication
 * [#10575](https://github.com/netbox-community/netbox/issues/10575) - Include OIDC dependencies for python-social-auth
-* [#10596](https://github.com/netbox-community/netbox/issues/10596) - Panels should scroll horizontally to accomodate overflow data
+* [#10584](https://github.com/netbox-community/netbox/issues/10584) - Fix service clone link
+* [#10655](https://github.com/netbox-community/netbox/issues/10655) - Correct display of assigned contacts in object tables
+* [#10596](https://github.com/netbox-community/netbox/issues/10596) - Panels should scroll horizontally to accommodate overflow data
 
 ---
 
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index a11139032..81ff6e912 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -60,23 +60,17 @@
       </div>
       {% include 'inc/panels/custom_fields.html' %}
       {% include 'inc/panels/tags.html' %}
+      {% include 'inc/panels/comments.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-      {% include 'inc/panels/comments.html' %}
+      {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
+      {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
       {% include 'inc/panels/contacts.html' %}
       {% include 'inc/panels/image_attachments.html' %}
       {% plugin_right_page object %}
     </div>
   </div>
-  <div class="row">
-    <div class="col col-md-6">
-      {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
-    </div>
-    <div class="col col-md-6">
-      {% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
-    </div>
-  </div>
   <div class="row">
     <div class="col col-md-12">
       {% plugin_full_width_page object %}