From 2af021040f9eec2bcf03b7f5e360fadc2b90bb16 Mon Sep 17 00:00:00 2001
From: Spitzer_Daniel <daniel.spitzer@inode.at>
Date: Mon, 20 Feb 2023 14:04:07 +0100
Subject: [PATCH] =?UTF-8?q?Vlans-Pops=20auf=20Order=20Pills=20ge=C3=A4nder?=
 =?UTF-8?q?t.=20IPv6=20Anzeige=20hinzugef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Layout/default/Devicemanufactor/Index.php |  4 +--
 Layout/default/Pop/Index.php              | 30 ++++++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Layout/default/Devicemanufactor/Index.php b/Layout/default/Devicemanufactor/Index.php
index 2eb12c5f3..82ac82ef2 100644
--- a/Layout/default/Devicemanufactor/Index.php
+++ b/Layout/default/Devicemanufactor/Index.php
@@ -36,7 +36,7 @@ $pagination_entity_name = "Devicemanufactor";
             margin-top: -5px;
         }
 
-        .edit-weight {
+        .edit-width {
             width: 50px;
         }
     </style>
@@ -81,7 +81,7 @@ $pagination_entity_name = "Devicemanufactor";
                 <tr>
                     <th class="text-center">Name</th>
                     <th class="text-center">Erstellt von</th>
-                    <th class="edit-weight"></th>
+                    <th class="edit-width"></th>
                 </tr>
                 <tr id="filterrow">
                     <th></th>
diff --git a/Layout/default/Pop/Index.php b/Layout/default/Pop/Index.php
index 01b475c6f..415ab89c2 100644
--- a/Layout/default/Pop/Index.php
+++ b/Layout/default/Pop/Index.php
@@ -36,6 +36,19 @@ $pagination_entity_name = "Pops";
             margin-left: 30px !important;
             margin-top: -5px;
         }
+
+        .edit-width {
+            width: 50px;
+        }
+        .font-weight-500
+        {
+            font-weight: 500;
+        }
+        .order-date-pill
+        {
+            margin: 2px;
+            white-space: nowrap;
+        }
     </style>
     <!-- start page title -->
     <div class="row">
@@ -78,9 +91,9 @@ $pagination_entity_name = "Pops";
                     <th>Name</th>
                     <th>Netgebiet</th>
                     <th>Zutritt</th>
-                    <th>Vlan Public/Nat</th>
+                    <th>Vlan Public/Nat/IPv6</th>
                     <th>Koordinaten</th>
-                    <th></th>
+                    <th class="edit-width"></th>
 
                 </tr>
                 <tr id="filterrow">
@@ -94,13 +107,22 @@ $pagination_entity_name = "Pops";
                 </tr>
                 </thead>
                 <tbody>
-                <?php foreach ($pops as $pop): ?>
+                <?php foreach ($pops as $pop):
+                    $vlans = "";
+
+                    if (!empty(trim($pop->vlan_public)))
+                        $vlans .= '<span class="order-date-pill active mb-0">Public: <span class="font-weight-500">' . $pop->vlan_public . '</span class="font-weight-500"></span>';
+                    if (!empty(trim($pop->vlan_nat)))
+                        $vlans .= '<span class="order-date-pill active mb-0">Nat: <span class="font-weight-500">' . $pop->vlan_nat . '</span></span>';
+                    if (!empty(trim($pop->vlan_ipv6)))
+                        $vlans .= '<span class="order-date-pill active mb-0">IPv6: <span class="font-weight-500">' . $pop->vlan_ipv6 . '</span></span>';
+                    ?>
 
                     <tr>
                         <td><?= $pop->name ?></td>
                         <td><?= $pop->network->name ?></td>
                         <td><?= $pop->location ?></td>
-                        <td class="text-center"><?= $pop->vlan_public ?> / <?= $pop->vlan_nat ?></td>
+                        <td class="text-center"><?= $vlans ?></td>
                         <td class="text-center"><a
                                     title="Google-Maps: <?= rtrim($pop->gps_lat, '0') ?> , <?= $pop->gps_long ?>"
                                     class="mapsLink"