Update sidebar

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

Hide file tree

Showing 37 changed files with 92 additions and 797 deletions.
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -33,7 +33,9 @@ THE SOFTWARE.
 
         <l:app-bar title="${%Plugin Manager}"/>
 
-        <st:include page="sidepanel.jelly"/>
+        <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"/>

diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly
@@ -30,28 +30,26 @@ THE SOFTWARE.
   <l:layout title="${%Available Plugins} - ${%Plugin Manager}" permission="${app.SYSTEM_READ}">
     <j:set var="page" value="available"/>
 
-    <l:app-bar title="${%Plugin Manager}" />
-
-    <st:include page="sidepanel.jelly"/>
+    <l:side-panel>
+      <local:sidepanel xmlns:local="/hudson/PluginManager" page="available" />
+    </l:side-panel>
 
     <l:main-panel>
-      <script src="${resURL}/jsbundles/plugin-manager-ui.js" type="text/javascript"/>
-
-      <form method="post" action="install">
-        <local:tabBar page="${page}" xmlns:local="/hudson/PluginManager"/>
-
-        <div class="jenkins-form-item jenkins-search">
-          <input
-            class="jenkins-search__input"
-            type="search"
-            id="filter-box"
-            value="${request.getParameter('filter')}"
-            placeholder="${%Search}"/>
-          <div class="jenkins-search__icon">
+      <div class="jenkins-app-bar jenkins-app-bar--sticky">
+        <div class="jenkins-app-bar__content">
+          <div class="app-plugin-manager__search">
             <l:icon src="symbol-search"/>
+            <input type="search"
+                   placeholder="Search available plugins"
+                   id="filter-box"
+                   value="${request.getParameter('filter')}" />
           </div>
         </div>
+      </div>
+
+      <script src="${resURL}/jsbundles/plugin-manager-ui.js" type="text/javascript"/>
 
+      <form method="post" action="install">
         <table id="plugins" class="jenkins-table sortable"
                data-hasAdmin="${h.hasPermission(app.ADMINISTER)}">
           <thead>

diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -30,21 +30,21 @@ THE SOFTWARE.
   <l:layout title="${%Installed Plugins} - ${%Plugin Manager}" permission="${app.SYSTEM_READ}">
     <j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
 
-    <st:include page="sidepanel.jelly"/>
+    <l:side-panel>
+      <local:sidepanel xmlns:local="/hudson/PluginManager" page="installed" />
+    </l:side-panel>
 
     <l:main-panel>
       <div class="jenkins-app-bar jenkins-app-bar--sticky">
         <div class="jenkins-app-bar__content">
           <div class="app-plugin-manager__search">
             <l:icon src="symbol-search"/>
             <input type="search"
-                   placeholder="Search available plugins"
+                   placeholder="Search installed plugins"
                    id="filter-box"
                    value="${request.getParameter('filter')}" />
           </div>
         </div>
-        <div class="jenkins-app-bar__controls">
-        </div>
       </div>
 
       <st:adjunct includes="hudson.PluginManager._table"/>
@@ -65,8 +65,6 @@ THE SOFTWARE.
            data-detached-possible-dependents="${%detached-possible-dependents}"
       />
 
-      <local:tabBar page="installed" xmlns:local="/hudson/PluginManager" />
-
       <table id="plugins" class="jenkins-table sortable">
         <j:choose>
           <j:when test="${empty(app.pluginManager.plugins) and empty(app.pluginManager.failedPlugins)}">

diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly
@@ -33,59 +33,68 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <!-- TODO - Remove this when all tasks (Jenkins' sidepanel items) are styled like this -->
-  <style>
-    #side-panel {
-    border-right: none;
-    padding-right: 0;
-    }
-  </style>
-
-  <div class="jenkins-side-nav">
+  <div id="tasks">
     <div class="jenkins-app-bar">
       <div class="jenkins-app-bar__content">
-        <h1>
-          ${%Plugins}
-        </h1>
+        <h1>${%Plugins}</h1>
       </div>
     </div>
 
-    <a href="./available" class="jenkins-side-nav__item ${page == 'available' ? 'jenkins-side-nav__item--selected' : ''}">
-      <div class="jenkins-side-nav__item__icon">
-        <l:ionicon name="bag-handle-outline" />
-      </div>
-      ${%Available plugins}
-    </a>
+    <div class="task">
+      <span class="task-link-wrapper">
+        <a href="./" class="task-link ${page == 'updates' ? 'task-link--active' : ''}">
+          <div class="task-icon-link">
+            <l:icon src="symbol-download" />
+          </div>
+          <span class="task-icon-text">
+            ${%Updates}
+          </span>
+          <j:if test="${app.updateCenter.updates.size() != 0}">
+            <span class="jenkins-side-nav__item__badge">
+              ${app.updateCenter.updates.size()}
+            </span>
+          </j:if>
+        </a>
+      </span>
+    </div>
 
-    <a href="./installed" class="jenkins-side-nav__item ${page == 'installed' ? 'jenkins-side-nav__item--selected' : ''}">
-      <div class="jenkins-side-nav__item__icon">
-        <l:ionicon name="extension-puzzle-outline" />
-      </div>
-      ${%Updates and installed plugins}
-      <j:if test="${app.updateCenter.updates.size() != 0}">
-        <span class="jenkins-side-nav__item__badge">
-          ${app.updateCenter.updates.size()}
-        </span>
-      </j:if>
-    </a>
+    <div class="task">
+      <span class="task-link-wrapper">
+        <a href="./available" class="task-link ${page == 'available' ? 'task-link--active' : ''}">
+          <div class="task-icon-link">
+            <l:icon src="symbol-shopping-bag" />
+          </div>
+          <span class="task-icon-text">
+            ${%Available plugins}
+          </span>
+        </a>
+      </span>
+    </div>
 
-    <a href="./advanced" class="jenkins-side-nav__item ${page == 'advanced' ? 'jenkins-side-nav__item--selected' : ''}">
-      <div class="jenkins-side-nav__item__icon">
-        <l:ionicon name="settings-outline" />
-      </div>
-      ${%Advanced settings}
-    </a>
-  </div>
+    <div class="task">
+      <span class="task-link-wrapper">
+        <a href="./installed" class="task-link ${page == 'installed' ? 'task-link--active' : ''}">
+          <div class="task-icon-link">
+            <l:icon src="symbol-plugins" />
+          </div>
+          <span class="task-icon-text">
+            ${%Installed plugins}
+          </span>
+        </a>
+      </span>
+    </div>
 
-  <div class="app-plugin-manager__restart-panel" id="needRestart" style="display:none;">
-    <l:ionicon name="warning-outline" />
-    <form method="post" action="${rootURL}/safeRestart">
-      You'll need to restart Jenkins for your changes to take effect
-      <j:if test="${app.lifecycle.canRestart()}">
-        <button class="jenkins-button">
-          ${%Restart once no jobs are running}
-        </button>
-      </j:if>
-    </form>
+    <div class="task">
+      <span class="task-link-wrapper">
+        <a href="./advanced" class="task-link ${page == 'advanced' ? 'task-link--active' : ''}">
+          <div class="task-icon-link">
+            <l:icon src="symbol-settings" />
+          </div>
+          <span class="task-icon-text">
+            ${%Advanced settings}
+          </span>
+        </a>
+      </span>
+    </div>
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar.jelly b/core/src/main/resources/hudson/PluginManager/tabBar.jelly
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties b/core/src/main/resources/hudson/PluginManager/tabBar_bg.properties
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties b/core/src/main/resources/hudson/PluginManager/tabBar_ca.properties
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_cs.properties b/core/src/main/resources/hudson/PluginManager/tabBar_cs.properties
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_da.properties b/core/src/main/resources/hudson/PluginManager/tabBar_da.properties
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_de.properties b/core/src/main/resources/hudson/PluginManager/tabBar_de.properties
diff --git a/core/src/main/resources/hudson/PluginManager/tabBar_es.properties b/core/src/main/resources/hudson/PluginManager/tabBar_es.properties