Fixes

janfaracik · Aug 11, 2023 · 0ea3a01 · 0ea3a01
1 parent 64f3080
commit 0ea3a01
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 71 deletions.
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -42,7 +42,7 @@ THE SOFTWARE.
     </l:side-panel>
 
     <l:main-panel>
-      <div class="behavior-loading"><l:spinner text="${%LOADING}"/></div>
+
 
       <f:form method="post" class="jenkins-form" action="configSubmit" name="config" tableClass="config-table">
         <l:app-bar title="${%General}" headingLevel="h2">

diff --git a/core/src/main/resources/hudson/model/Run/configure.jelly b/core/src/main/resources/hudson/model/Run/configure.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
     <st:include page="sidepanel.jelly" />
     <l:breadcrumb title="${%Edit Build Information}" />
     <l:main-panel>
-      <div class="behavior-loading"><l:spinner text="${%LOADING}"/></div>
+
       <f:form method="post" action="configSubmit" name="config">
         <j:set var="readOnlyMode" value="${!h.hasPermission(it,it.UPDATE)}"/>
         <f:entry title="${%DisplayName}" help="/help/run-config/displayName.html">

diff --git a/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy b/core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
@@ -19,10 +19,6 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName, cssclass:request.getP
 
         set("readOnlyMode", !app.hasPermission(app.ADMINISTER))
 
-        p()
-        div(class:"behavior-loading") {
-            l.spinner(text: _("LOADING"))
-        }
         f.form(method:"post",name:"config",action:"configure", class: "jenkins-form") {
             set("instance",my)
             set("descriptor", my.descriptor)

diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -40,7 +40,7 @@ THE SOFTWARE.
       <st:include page="downgrade.jelly" />
     </section>
 
-    <div class="behavior-loading"><l:spinner text="${%LOADING}"/></div>
+
 
     <f:form method="post" name="config" action="configSubmit" class="jenkins-form">
       <j:set var="instance" value="${it}" />

diff --git a/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly b/core/src/main/resources/jenkins/model/Jenkins/sidepanel.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <l:side-panel>
     <l:app-bar title="${%Settings}" />
 
-    <div id="tasks">
+    <div id="tasks" class="hidebreadcrumbs">
       <l:search-bar placeholder="${%Search}" id="settings-search-bar" />
 
       <script src="${resURL}/jsbundles/pages/manage-jenkins.js" type="text/javascript" />
@@ -44,5 +44,7 @@ THE SOFTWARE.
         </j:forEach>
       </j:forEach>
     </div>
+
+    <div class="behavior-loading"><l:spinner text="${%Loading}"/></div>
   </l:side-panel>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy b/core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy
@@ -1,11 +1,3 @@
 package jenkins.model.MasterBuildConfiguration
 
 def f=namespace(lib.FormTagLib)
-
-f.entry(title:_("# of executors"), field:"numExecutors") {
-    f.number(clazz:"non-negative-number-required", min:0, step:1)
-}
-f.entry(title:_("Labels"),field:"labelString") {
-    f.textbox()
-}
-f.slave_mode(name:"builtin.mode",node:app)
diff --git a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
@@ -15,10 +15,6 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName) {
     l.main_panel {
         l.app_bar(title: my.displayName)
 
-        div(class:"behavior-loading") {
-            l.spinner(text: _("LOADING"))
-        }
-
         f.form(method:"post",name:"config",action:"configure", class: "jenkins-form") {
             Functions.getSortedDescriptorsForGlobalConfigByDescriptor(my.FILTER).each { Descriptor descriptor ->
                 set("descriptor",descriptor)

diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -178,6 +178,42 @@ THE SOFTWARE.
   </head>
   <body id="jenkins" class="yui-skin-sam ${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
 
+
+    <div class="newsidebar">
+      <j:forEach var="pd" items="${h.pageDecorators}">
+        <j:if test="${pd.class.getSimpleName() == 'NavigationPageDecorator'}">
+          <j:forEach var="nav" items="${pd.getVisibleItems()}">
+            <j:set var="isCurrent" value="${h.hyperlinkMatchesCurrentPage(nav.url)}" />
+            <j:set var="tooltip">
+              <st:include it="${nav}" page="jumplist.jelly" optional="true" />
+            </j:set>
+
+            <j:if test="${tooltip.length() == 0}">
+              <j:set var="tooltip">
+                <div>${nav.displayName}</div>
+                <j:if test="${nav.badge != null}">
+                  <div style="color: var(--text-color-secondary)">${nav.badge.tooltip}</div>
+                </j:if>
+              </j:set>
+            </j:if>
+
+            <a href="${rootURL}/${nav.url}"
+               tooltip="${nav.displayName}"
+               data-html-tooltip="${tooltip}"
+               data-tooltip-interactive="true"
+               data-tooltip-type="sidebar"
+               class="newsidebar__item ${isCurrent ? 'newsidebar__item--active' : null}">
+              <l:icon src="${nav.icon}" />
+              <span class="jenkins-visually-hidden">${nav.displayName}</span>
+              <j:if test="${nav.badge != null}">
+                <span class="badge-thing badge-thing--${nav.badge.severity}" />
+              </j:if>
+            </a>
+          </j:forEach>
+        </j:if>
+      </j:forEach>
+    </div>
+
     <j:if test="${layoutType!='full-screen'}">
       <!-- for accessibility, skip the entire navigation bar and etc and go straight to the head of the content -->
       <a href="#skip2content" class="jenkins-skip-link">Skip to content</a>
@@ -259,41 +295,6 @@ THE SOFTWARE.
         </div>
       </footer>
     </j:if>
-
-    <div class="newsidebar">
-      <j:forEach var="pd" items="${h.pageDecorators}">
-        <j:if test="${pd.class.getSimpleName() == 'NavigationPageDecorator'}">
-          <j:forEach var="nav" items="${pd.getVisibleItems()}">
-            <j:set var="isCurrent" value="${h.hyperlinkMatchesCurrentPage(nav.url)}" />
-            <j:set var="tooltip">
-              <st:include it="${nav}" page="jumplist.jelly" optional="true" />
-            </j:set>
-
-            <j:if test="${tooltip.length() == 0}">
-              <j:set var="tooltip">
-                <div>${nav.displayName}</div>
-                <j:if test="${nav.badge != null}">
-                  <div style="color: var(--text-color-secondary)">${nav.badge.tooltip}</div>
-                </j:if>
-              </j:set>
-            </j:if>
-
-            <a href="${rootURL}/${nav.url}"
-               tooltip="${nav.displayName}"
-               data-html-tooltip="${tooltip}"
-               data-tooltip-interactive="true"
-               data-tooltip-type="sidebar"
-               class="newsidebar__item ${isCurrent ? 'newsidebar__item--active' : null}">
-              <l:icon src="${nav.icon}" />
-              <span class="jenkins-visually-hidden">${nav.displayName}</span>
-              <j:if test="${nav.badge != null}">
-                <span class="badge-thing badge-thing--${nav.badge.severity}" />
-              </j:if>
-            </a>
-          </j:forEach>
-        </j:if>
-      </j:forEach>
-    </div>
   </body>
 </html>
 </l:view>

diff --git a/war/src/main/scss/abstracts/theme.scss b/war/src/main/scss/abstracts/theme.scss
@@ -50,7 +50,7 @@ $semantics: (
   --dark-grey: #4d545d;
 
   // branding
-  --secondary: hsl(240, 10%, 50%);
+  --secondary: hsl(240, 20%, 55%);
   --focus: #3fb3f7;
   --focus-btn-primary: #{color.change(#0b6aa2, $alpha: 0.5)};
   --focus-btn-secondary: #{color.change(#0b6aa2, $alpha: 0.5)};
@@ -286,9 +286,6 @@ $semantics: (
   --input-border: #c3ccd1;
   --input-border-hover: #5c7889;
   --input-hidden-password-bg-color: #f9f9f9;
-  --form-item-max-width: min(65vw, 1600px);
-  --form-item-max-width--medium: min(50vw, 1400px);
-  --form-item-max-width--small: min(35vw, 1200px);
 
   @media screen and (max-width: breakpoints.$tablet-breakpoint) {
     --section-padding: 1.25rem;

diff --git a/war/src/main/scss/base/layout-commons.scss b/war/src/main/scss/base/layout-commons.scss
@@ -54,6 +54,7 @@
 
 #main-panel {
   padding: var(--section-padding);
+  padding-top: 20px;
   display: inline-block;
   width: 100%;
 }

diff --git a/war/src/main/scss/base/style.scss b/war/src/main/scss/base/style.scss
@@ -492,7 +492,7 @@ pre.console {
 
   &--stuck {
     .bottom-sticker-inner {
-      backdrop-filter: blur(15px);
+      backdrop-filter: blur(10px);
 
       &::before {
         opacity: 0.75 !important;

diff --git a/war/src/main/scss/modules/breadcrumbs.scss b/war/src/main/scss/modules/breadcrumbs.scss
@@ -1,5 +1,30 @@
 @use "../abstracts/mixins";
 
+body:has(.hidebreadcrumbs) {
+  .jenkins-breadcrumbs {
+    opacity: 0;
+    pointer-events: none;
+  }
+
+  #page-body {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+
+    .app-page-body__sidebar {
+      margin-top: -10px;
+      width: 300px;
+    }
+
+    #main-panel {
+      min-width: calc(100vw - 550px) !important;
+      padding: 0 !important;
+      padding-top: 10px !important;
+      flex-grow: 0 !important;
+    }
+  }
+}
+
 .jenkins-breadcrumbs {
   position: sticky;
   top: var(--section-padding);

diff --git a/war/src/main/scss/modules/side-panel-tasks.scss b/war/src/main/scss/modules/side-panel-tasks.scss
@@ -33,7 +33,7 @@ $background-outset: 0.7rem;
 
 #side-panel {
   .jenkins-app-bar {
-    margin-top: var(--section-padding);
+    margin-top: 20px;
     margin-left: var(--section-padding);
     margin-right: var(--section-padding);
 

diff --git a/war/src/main/scss/modules/spinner.scss b/war/src/main/scss/modules/spinner.scss
@@ -53,19 +53,11 @@
   display: flex !important;
   align-items: center;
   justify-content: center;
-  inset: 0;
+  inset: 0 50px 0 420px;
   z-index: 999;
-  backdrop-filter: blur(15px);
+  background: var(--background);
   transition: var(--standard-transition);
 
-  &::before {
-    content: "";
-    position: absolute;
-    inset: 0;
-    background: var(--background);
-    opacity: 0.95;
-  }
-
   .jenkins-spinner {
     animation: fade-in-jenkins-spinner 0.4s ease;
   }