Moved piggyback to operations tab

Signed-off-by: Vasil Vasilev <vasil.vasilev@bosch.com>
eclipse-ditto · Nov 7, 2023 · 51d7a0b · 51d7a0b
1 parent f71113b
commit 51d7a0b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 deletions.
diff --git a/ui/index.html b/ui/index.html
@@ -68,11 +68,6 @@
                             Connections
                         </a>
                     </li>
-                    <li class="nav-item" id="tabPiggyback">
-                        <a class="nav-link" data-bs-target="#collapsePiggyback:not(.show)" data-bs-toggle="collapse">
-                            Piggyback
-                        </a>
-                    </li>
                     <li class="nav-item" id="tabOperations" data-auth="devOps">
                         <a class="nav-link" data-bs-target="#collapseOperations:not(.show)" data-bs-toggle="collapse">
                             Operations
@@ -107,9 +102,6 @@
         <div class="collapse" id=collapseConnections data-bs-parent="#page-content">
             <div id="connectionsHTML"></div>
         </div>
-        <div class="collapse" id="collapsePiggyback" data-bs-parent="#page-content">
-            <div id="piggybackHTML"></div>
-        </div>
         <div class="collapse" id=collapseOperations data-bs-parent="#page-content">
             <div id="operationsHTML"></div>
         </div>

diff --git a/ui/modules/operations/operations.html b/ui/modules/operations/operations.html
@@ -9,41 +9,47 @@
   ~ http://www.eclipse.org/legal/epl-2.0
   ~
   ~ SPDX-License-Identifier: EPL-2.0
-  -->
-<h5>Ditto Services Logging</h5>
+-->
+
+<div id="piggybackHTML"></div>
+
+<h5 data-bs-toggle="collapse" data-bs-target="#servicesLogging">Ditto Services Logging</h5>
 <hr />
-<div class="input-group input-group-sm mt-1 mb-1" role="group">
-    <div style="flex-grow: 1;"></div>
-    <button class="btn btn-outline-primary btn-sm button_round_left" id="buttonLoadAllLogLevels">
-        <i class="bi bi-arrow-clockwise"></i>
-        Refresh
-    </button>
-</div>
-<div class="row resizable_pane" style="height: 80vh">
-    <div class="col-md-12 resizable_flex_column">
-        <div id="divLoggers"></div>
-        <template id="templateLogger">
-            <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
-                integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-            <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
-                rel="stylesheet"
-                integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
-                crossorigin="anonymous" referrerpolicy="no-referrer" />
-            <link href="./dist/main.css" rel="stylesheet" />
-
-            <div class="input-group input-group-sm mb-1">
-                <input class="form-control" type="text" disabled id="inputLogger" spellcheck="false"></input>
-                <div class="btn-group" role="group">
-                    <input type="radio" class="btn-check" id="debug" autocomplete="off">
-                    <label class="btn btn-sm btn-outline-secondary" for="debug">DEBUG</label>
-                    <input type="radio" class="btn-check" id="info" autocomplete="off">
-                    <label class="btn btn-sm btn-outline-success" for="info">INFO</label>
-                    <input type="radio" class="btn-check" id="warn" autocomplete="off">
-                    <label class="btn btn-sm btn-outline-warning" for="warn">WARN</label>
-                    <input type="radio" class="btn-check" id="error" autocomplete="off">
-                    <label class="btn btn-sm btn-outline-danger" for="error">ERROR</label>
+<div class="collapse show" id="servicesLogging">
+    <div class="input-group input-group-sm mt-1 mb-1" role="group">
+        <div style="flex-grow: 1;"></div>
+        <button class="btn btn-outline-primary btn-sm button_round_left" id="buttonLoadAllLogLevels">
+            <i class="bi bi-arrow-clockwise"></i>
+            Refresh
+        </button>
+    </div>
+    <div class="row resizable_pane" style="height: 80vh">
+        <div class="col-md-12 resizable_flex_column">
+            <div id="divLoggers"></div>
+            <template id="templateLogger">
+                <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
+                    integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
+                    crossorigin="anonymous">
+                <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.8.3/font/bootstrap-icons.min.css"
+                    rel="stylesheet"
+                    integrity="sha512-YzwGgFdO1NQw1CZkPoGyRkEnUTxPSbGWXvGiXrWk8IeSqdyci0dEDYdLLjMxq1zCoU0QBa4kHAFiRhUL3z2bow=="
+                    crossorigin="anonymous" referrerpolicy="no-referrer" />
+                <link href="./dist/main.css" rel="stylesheet" />
+
+                <div class="input-group input-group-sm mb-1">
+                    <input class="form-control" type="text" disabled id="inputLogger" spellcheck="false"></input>
+                    <div class="btn-group" role="group">
+                        <input type="radio" class="btn-check" id="debug" autocomplete="off">
+                        <label class="btn btn-sm btn-outline-secondary" for="debug">DEBUG</label>
+                        <input type="radio" class="btn-check" id="info" autocomplete="off">
+                        <label class="btn btn-sm btn-outline-success" for="info">INFO</label>
+                        <input type="radio" class="btn-check" id="warn" autocomplete="off">
+                        <label class="btn btn-sm btn-outline-warning" for="warn">WARN</label>
+                        <input type="radio" class="btn-check" id="error" autocomplete="off">
+                        <label class="btn btn-sm btn-outline-danger" for="error">ERROR</label>
+                    </div>
                 </div>
-            </div>
-        </template>
+            </template>
+        </div>
     </div>
 </div>
diff --git a/ui/modules/piggyback/piggyback.html b/ui/modules/piggyback/piggyback.html
@@ -10,12 +10,14 @@
   ~
   ~ SPDX-License-Identifier: EPL-2.0
   -->
-<div>
-    <div class="row-cols-md-auto" style="height: 87%;">
-        <h5>Piggyback commands</h5>
-        <hr />
+<h5 data-bs-toggle="collapse" data-bs-target="#piggyBackCommands">
+    Piggyback Commands
+</h5>
+<hr />
+<div class="collapse show" id="piggyBackCommands" style="height: 87%;">
+    <div class="row-cols-md-auto">
         <div class="col-md-auto resizable_flex_column">
-            <div class="row mb-1" style="flex-grow: 0.9;">
+            <div class="row mb-1" style="flex-grow: 1;">
                 <div class="col-md-6 resizable_flex_column">
                     <div class="col-md-auto resizable_flex_column">
                         <div class="row mb-1">