functional....need more navbar cleanup

f5devcentral · May 1, 2024 · dd6584a · dd6584a
1 parent 6ffadac
commit dd6584a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 35 deletions.
diff --git a/labapp/app/static/custom.css b/labapp/app/static/custom.css
@@ -119,7 +119,7 @@ main {
 }
 .btn-toggle-nav a:hover,
 .btn-toggle-nav a:focus {
-  background-color: #d2f4ea;
+  background-color: #d4e0e0;
 }
 
 .scrollarea {

diff --git a/labapp/app/static/helpers.js b/labapp/app/static/helpers.js
@@ -39,19 +39,3 @@ async function makeHttpRequest(buttonId, requestUrl, resultDivId) {
       resultDiv.scrollIntoView({ behavior: 'smooth', block: 'end' });
   }
 }
-
-function restoreAccordionPanel(storageKey, accordionId) {
-    var activeItem = localStorage.getItem(storageKey);
-    if (activeItem) {
-        //remove default collapse settings
-        $(accordionId + " .panel-collapse").removeClass('in');
-
-        //show the account_last visible group
-        $("#" + activeItem).addClass("in");
-    }
-}
-
-function saveActiveAccordionPanel(storageKey, e) {
-    localStorage.setItem(storageKey, e.target.id);
-}
-
diff --git a/labapp/app/templates/base.html b/labapp/app/templates/base.html
@@ -16,8 +16,6 @@
 
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <link href="/static/custom.css" rel="stylesheet">
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script src="/static/helpers.js"></script>
 </head>
 <body>
@@ -32,7 +30,7 @@
                 </a>
                 <ul class="list-unstyled ps-0">
                   <li class="mb-1">
-                    <button class="btn btn-toggle align-items-center rounded collapsed" data-bs-toggle="collapse" data-bs-target="#home-collapse" aria-expanded="false">
+                    <button class="btn btn-toggle align-items-center rounded collapsed disabled" data-bs-toggle="collapse-null" data-bs-target="#home-collapse" aria-expanded="false">
                       Home
                     </button>
                     <div class="collapse show" id="home-collapse">
@@ -44,7 +42,7 @@
                     </div>
                   </li>
                   <li class="mb-1">
-                    <button class="btn btn-toggle align-items-center rounded collapsed" data-bs-toggle="collapse" data-bs-target="#appconnect-collapse" aria-expanded="false">
+                    <button class="btn btn-toggle align-items-center rounded collapsed disabled" data-bs-toggle="collapse-null" data-bs-target="#appconnect-collapse" aria-expanded="false">
                       App Connect
                     </button>
                     <div class="collapse show" id="appconnect-collapse">
@@ -56,7 +54,7 @@
                     </div>
                   </li>
                   <li class="mb-1">
-                    <button class="btn btn-toggle align-items-center rounded collapsed" data-bs-toggle="collapse" data-bs-target="#netconnect-collapse" aria-expanded="false">
+                    <button class="btn btn-toggle align-items-center rounded collapsed disabled" data-bs-toggle="collapse-null" data-bs-target="#netconnect-collapse" aria-expanded="false">
                       Network Connect
                     </button>
                     <div class="collapse show" id="netconnect-collapse">
@@ -68,28 +66,18 @@
                   </li>
                   <li class="border-top my-3"></li>
                   <li class="mb-1">
-                    <button class="btn btn-toggle align-items-center rounded collapsed" data-bs-toggle="collapse" data-bs-target="#status-collapse" aria-expanded="false">
+                    <button class="btn btn-toggle align-items-center rounded collapsed disabled" data-bs-toggle="collapse-null" data-bs-target="#status-collapse" aria-expanded="false">
                       Miscellaneous
                     </button>
-                    <div class="collapse" id="status-collapse">
+                    <div class="collapse show" id="status-collapse">
                       <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
                         <li><a href="/ref" class="link-dark rounded">Reference</a></li>
                         <li><a href="/score" class="link-dark rounded">Scoreboard</a></li>
                       </ul>
                     </div>
                   </li>
                 </ul>
-        </div>
-        <script>
-          $(function () {
-            $('#sidebar').on('shown.bs.collapse', function (e) {
-                saveActiveAccordionPanel('accordion-activePanel', e);
-            })        
-          });
-          restoreAccordionPanel('accordion-activePanel', '#sidebar');
-        </script>
-
-
+        </div>  
       </div>
 
         <!-- Main Content -->