Push

janfaracik · Feb 8, 2025 · 16f2b22 · 16f2b22
1 parent a2f855a
commit 16f2b22
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 45 deletions.
diff --git a/core/src/main/resources/lib/layout/app-bar.jelly b/core/src/main/resources/lib/layout/app-bar.jelly
@@ -23,7 +23,7 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:x="jelly:xml" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:x="jelly:xml">
   <st:documentation>
     <st:attribute name="title" use="required">
       The title for the application bar
@@ -37,17 +37,19 @@ THE SOFTWARE.
     Generates a row containing the page title and an optional set of controls
   </st:documentation>
 
-  <div class="jenkins-app-bar">
-    <div class="jenkins-app-bar__content">
-      <x:element name="${headingLevel ?: 'h1'}">
-        ${title}
-        <j:if test="${attrs.subtitle != null}">
-          <span class="jenkins-app-bar__subtitle">${attrs.subtitle}</span>
-        </j:if>
-      </x:element>
+  <j:if test="${mode=='main-panel' or mode=='side-panel'}">
+    <div class="jenkins-app-bar">
+      <div class="jenkins-app-bar__content">
+        <x:element name="${headingLevel ?: 'h1'}">
+          ${title}
+          <j:if test="${attrs.subtitle != null}">
+            <span class="jenkins-app-bar__subtitle">${attrs.subtitle}</span>
+          </j:if>
+        </x:element>
+      </div>
+      <div class="jenkins-app-bar__controls">
+        <d:invokeBody/>
+      </div>
     </div>
-    <div class="jenkins-app-bar__controls">
-      <d:invokeBody/>
-    </div>
-  </div>
+  </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/main-panel.jelly b/core/src/main/resources/lib/layout/main-panel.jelly
@@ -61,7 +61,7 @@ THE SOFTWARE.
       <a id="skip2content" />
       <button id="opencloseting" class="jenkins-button jenkins-button--tertiary">
         <l:icon src="symbol-sidebar" />
-        ${%Menu}
+        ${%Menu}2
       </button>
       <x:comment>&#10;start of main content ⇒&#10;</x:comment>
       <d:invokeBody />

diff --git a/src/main/js/app.js b/src/main/js/app.js
@@ -6,6 +6,9 @@ import Tooltips from "@/components/tooltips";
 import StopButtonLink from "@/components/stop-button-link";
 import ConfirmationLink from "@/components/confirmation-link";
 import Dialogs from "@/components/dialogs";
+import Utils from "@/components/dropdowns/utils";
+import Path from "@/util/path";
+import { createElementFromHtml } from "@/util/dom";
 
 Dropdowns.init();
 CommandPalette.init();
@@ -16,21 +19,16 @@ StopButtonLink.init();
 ConfirmationLink.init();
 Dialogs.init();
 
-const closer = document.querySelector("#closer")
-const sidepanel = document.querySelector("#side-panel")
-const thing = document.querySelector("#main-panel #opencloseting");
+const sidepanel = document.querySelector("#side-panel #tasks")
+const thing2 = document.querySelector("#main-panel #opencloseting");
 
 if (!sidepanel) {
-  closer.remove();
-  thing.remove();
-} else {
-  thing.addEventListener("click", () => {
-    closer.classList.toggle("opennn");
-    sidepanel.classList.toggle("opennn");
-  })
-
-  closer.addEventListener("click", () => {
-    closer.classList.toggle("opennn");
-    sidepanel.classList.toggle("opennn");
-  })
+  thing2.remove();
+  thing2.remove();
 }
+
+Utils.generateDropdown(thing2, (instance) => {
+  const parent = createElementFromHtml(`<div class="jenkins-dropdown testtest"></div>`)
+  parent.append(sidepanel.cloneNode(true))
+  instance.setContent(parent);
+})
diff --git a/src/main/scss/base/_layout-commons.scss b/src/main/scss/base/_layout-commons.scss
@@ -97,16 +97,6 @@
     flex-direction: column;
     gap: 0;
 
-    #opencloseting {
-      display: flex;
-      margin: -0.5rem 0 0 -0.9rem;
-
-      svg {
-        width: 1.5rem;
-        height: 1.5rem;
-      }
-    }
-
     &__side-panel {
       position: fixed;
 
@@ -135,12 +125,6 @@
         display: none;
       }
     }
-
-    @starting-style { /* <-- and this line */
-      .app-page-body__side-panel.opennn {
-        translate: 0 100%;
-      }
-    }
   }
 }
 

diff --git a/src/main/scss/styles.scss b/src/main/scss/styles.scss
@@ -3,3 +3,15 @@
 @use "components";
 @use "form";
 @use "pages";
+
+.testtest {
+  min-width: 240px;
+
+  #tasks, .task {
+    display: contents;
+  }
+
+  .jenkins-search-container {
+    display: none;
+  }
+}