Finish

janfaracik · Apr 21, 2022 · addb738 · addb738
1 parent 53902db
commit addb738
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 6 deletions.
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -31,15 +31,13 @@ THE SOFTWARE.
     <l:layout title="${%Advanced Settings} - ${%Plugin Manager}" permission="${app.SYSTEM_READ}">
         <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
 
-        <l:app-bar title="${%Plugin Manager}"/>
+        <l:app-bar title="${%Advanced settings}"/>
 
         <l:side-panel>
           <local:sidepanel xmlns:local="/hudson/PluginManager" page="advanced" />
         </l:side-panel>
 
         <l:main-panel>
-            <local:tabBar page="advanced" xmlns:local="/hudson/PluginManager"/>
-
             <section class="jenkins-section">
                 <h2 class="jenkins-section__title">${%HTTP Proxy Configuration}</h2>
                 <f:form method="post" action="proxyConfigure" name="proxyConfigure">

diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <div id="tasks">
+  <div id="tasks" class="app-plugin-manager__sidebar">
     <div class="jenkins-app-bar">
       <div class="jenkins-app-bar__content">
         <h1>${%Plugins}</h1>
@@ -50,7 +50,7 @@ THE SOFTWARE.
             ${%Updates}
           </span>
           <j:if test="${app.updateCenter.updates.size() != 0}">
-            <span class="jenkins-side-nav__item__badge">
+            <span class="task-icon-badge">
               ${app.updateCenter.updates.size()}
             </span>
           </j:if>
@@ -96,5 +96,22 @@ THE SOFTWARE.
         </a>
       </span>
     </div>
+
+    <j:if test="${!app.updateCenter.jobs.isEmpty()}">
+      <hr />
+
+      <div class="task">
+        <span class="task-link-wrapper">
+          <a href="../updateCenter" class="task-link">
+            <div class="task-icon-link">
+              <l:icon src="symbol-list" />
+            </div>
+            <span class="task-icon-text">
+              ${%Update Center}
+            </span>
+          </a>
+        </span>
+      </div>
+    </j:if>
   </div>
 </j:jelly>
diff --git a/war/src/main/js/plugin-manager-ui.js b/war/src/main/js/plugin-manager-ui.js
@@ -60,7 +60,7 @@ document.addEventListener("DOMContentLoaded", function () {
     var filterInput = document.getElementById('filter-box');
     filterInput.addEventListener('input', function (e) {
         debouncedFilter(e);
-        filterInput.parentElement.classList.add("jenkins-search--loading");
+        filterInput.parentElement.classList.add("app-plugin-manager__search--loading");
     });
 
     filterInput.focus();

diff --git a/war/src/main/less/modules/side-panel-tasks.less b/war/src/main/less/modules/side-panel-tasks.less
@@ -15,6 +15,26 @@
   }
 }
 
+#tasks h1 {
+  margin-top: 0.4rem;
+}
+
+#tasks hr {
+  position: relative;
+  width: 100%;
+  border: none;
+  height: 2px;
+
+  &::before {
+    content: "";
+    position: absolute;
+    inset: 0 0 0 -0.8rem;
+    background: currentColor;
+    border-radius: 2px;
+    opacity: 0.1;
+  }
+}
+
 #tasks .task {
   margin: 0 0 0 -0.8rem;
 }
@@ -89,6 +109,29 @@
     }
   }
 
+  .task-icon-badge {
+    position: relative;
+    color: currentColor;
+    letter-spacing: 0;
+    z-index: 0;
+    margin-left: auto;
+    min-width: 24px;
+    text-align: center;
+    padding: 0 8px;
+    line-height: 0.75rem;
+    font-size: 0.75rem;
+
+    &::before {
+      content: "";
+      position: absolute;
+      inset: -6px 0;
+      background: currentColor;
+      border-radius: 100px;
+      z-index: -1;
+      opacity: 0.1;
+    }
+  }
+
   &:active,
   &:focus {
     &::before {

diff --git a/war/src/main/less/pages/plugin-manager.less b/war/src/main/less/pages/plugin-manager.less
@@ -117,6 +117,16 @@
   }
 }
 
+.app-plugin-manager__sidebar {
+  position: sticky;
+  top: calc(40px + 1.6rem);
+
+  h1 {
+    margin-top: 1rem !important;
+    margin-bottom: 0.1rem !important;
+  }
+}
+
 .app-plugin-manager__search {
   position: relative;
   display: grid;