From b31ba4e9d2cdbceee829e240780a33d58a65c87e Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 7 Oct 2021 12:41:24 -0400
Subject: [PATCH] Changelog & UI tweaks for #6879

---
 docs/release-notes/version-3.0.md              |  1 +
 netbox/templates/dcim/rack.html                | 12 +++++++-----
 netbox/templates/dcim/rack_elevation_list.html |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 09fb14a4b..d6e92499c 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+* [#6879](https://github.com/netbox-community/netbox/issues/6879) - Improve ability to toggle images/labels in rack elevations 
 * [#7485](https://github.com/netbox-community/netbox/issues/7485) - Add USB micro AB type
 
 ### Bug Fixes
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 98009cb55..5d44e2125 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -18,11 +18,6 @@
 {% endblock %}
 
 {% block extra_controls %}
-  <select class="btn btn-sm btn-outline-dark rack-view">
-    <option value="images-and-labels" selected="selected">Images and Labels</option>
-    <option value="images-only">Images only</option>
-    <option value="labels-only">Labels only</option>
-  </select>
   <a {% if prev_rack %}href="{% url 'dcim:rack' pk=prev_rack.pk %}{% endif %}" class="btn btn-sm btn-primary{% if not prev_rack %} disabled{% endif %}">
     <i class="mdi mdi-chevron-left" aria-hidden="true"></i> Previous
   </a>
@@ -272,6 +267,13 @@
         {% plugin_left_page object %}
 	  </div>
     <div class="col col-12 col-xl-7">
+      <div class="text-end mb-4">
+        <select class="btn btn-sm btn-outline-dark rack-view">
+          <option value="images-and-labels" selected="selected">Images and Labels</option>
+          <option value="images-only">Images only</option>
+          <option value="labels-only">Labels only</option>
+        </select>
+      </div>
         <div class="row" style="margin-bottom: 20px">
             <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
               <div style="margin-left: 30px">
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index f5641c944..312b543a6 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -8,7 +8,7 @@
     <div class="controls">
         <div class="control-group">
             <div class="btn-group btn-group-sm" role="group">
-                <select class="btn btn-sm btn-outline-secondary active rack-view">
+                <select class="btn btn-sm btn-outline-secondary rack-view">
                   <option value="images-and-labels" selected="selected">Images and Labels</option>
                   <option value="images-only">Images only</option>
                   <option value="labels-only">Labels only</option>