From a9c9c2ea35d2ba229f0f31ef8e41cc5656f171b8 Mon Sep 17 00:00:00 2001
From: Simon Oliver Tveit <simtve@uninett.no>
Date: Tue, 5 Dec 2023 13:29:08 +0100
Subject: [PATCH 1/2] Always occupy space if PoE column is active

If poe column is active, which means some interfaces
will have a poe state dropdown option, the lines that do not have
a poe state dropdown still needs to occupy the space, else the
save button will shift to the left and not be lined up with all the
other save buttons.
---
 python/nav/web/templates/portadmin/portlist.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/python/nav/web/templates/portadmin/portlist.html b/python/nav/web/templates/portadmin/portlist.html
index e6f40e6a98..06ef3c7d9c 100644
--- a/python/nav/web/templates/portadmin/portlist.html
+++ b/python/nav/web/templates/portadmin/portlist.html
@@ -169,20 +169,20 @@
 
       {# POE STATE #}
       {% if supports_poe %}
-        {% if interface.supports_poe %}
         <div class="medium-1 small-4 column">
-          <form class="custom">
-            <select class="poelist" name="{{ interface.ifname }}">
-              {% for poe_option in poe_options %}
+          {% if interface.supports_poe %}
+            <form class="custom">
+              <select class="poelist" name="{{ interface.ifname }}">
+                {% for poe_option in poe_options %}
                   <option value="{{ poe_option.name }}" label="{{ poe_option.name }}"
                           {% if interface.poe_state.name == poe_option.name %}selected="selected"
                           data-orig="{{ poe_option.name }}"{% endif %}>
                     {{ vlan }}
-              {% endfor %}
-            </select>
-          </form>
+                {% endfor %}
+              </select>
+            </form>
+          {% endif %}
         </div>
-        {% endif %}
       {% endif %}
 
       {# Button for saving #}

From a9aa56c077e1f1f3c51fc7e8eeea4ea6a5f7f12d Mon Sep 17 00:00:00 2001
From: Simon Oliver Tveit <simtve@uninett.no>
Date: Tue, 5 Dec 2023 13:34:25 +0100
Subject: [PATCH 2/2] Remove random vlan line

This was probably left over from basing the Poe dropdown
on the vlan dropdown
---
 python/nav/web/templates/portadmin/portlist.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/nav/web/templates/portadmin/portlist.html b/python/nav/web/templates/portadmin/portlist.html
index 06ef3c7d9c..342e52033f 100644
--- a/python/nav/web/templates/portadmin/portlist.html
+++ b/python/nav/web/templates/portadmin/portlist.html
@@ -177,7 +177,6 @@
                   <option value="{{ poe_option.name }}" label="{{ poe_option.name }}"
                           {% if interface.poe_state.name == poe_option.name %}selected="selected"
                           data-orig="{{ poe_option.name }}"{% endif %}>
-                    {{ vlan }}
                 {% endfor %}
               </select>
             </form>