Merge branch 'master' into new-details-widget

.gitignore

@@ -55,7 +55,27 @@ jenkins_*.changes
 *.pkg
 *.zip
 push-build.sh
-war/node_modules/
-war/yarn-error.log
+node_modules/
+yarn-error.log
 .java-version
 .checkstyle
+
+/rebel.xml
+junit.xml
+
+# Yarn
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.pnp.*
+.yarn/*
+.yarnrc.yml
+!.yarn/patches
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+
+# Node
+node/
+node_modules/
+
+# Generated JavaScript Bundles
+jsbundles

war/.prettierignore → .prettierignore

@@ -10,19 +10,19 @@ node/
 .yarnrc.yml
 
 # libraries / external deps / generated files
-src/main/js/plugin-setup-wizard/bootstrap-detached.js
-src/main/webapp/scripts/yui
-src/main/webapp/jsbundles/
-src/main/scss/_bootstrap.scss
+war/src/main/js/plugin-setup-wizard/bootstrap-detached.js
+war/src/main/webapp/scripts/yui
+war/src/main/webapp/jsbundles/
+war/src/main/scss/_bootstrap.scss
 
 # test files that we don't need formatted
-../test/src/test/resources
-../test/jmh-report.json
+test/src/test/resources
+test/jmh-report.json
 
 # doesn't work, see https://github.com/prettier/prettier/issues/5340
 *.hbs
 
 .yarn
 
 # Incorrectly flagging forwarding slashes in regex
-../.github/renovate.json
+.github/renovate.json

war/.stylelintrc.js → .stylelintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   extends: "stylelint-config-standard",
   customSyntax: "postcss-scss",
-  ignoreFiles: ["src/main/scss/_bootstrap.scss"],
+  ignoreFiles: ["war/src/main/scss/_bootstrap.scss"],
   rules: {
     "no-descending-specificity": null,
     "selector-class-pattern": "[a-z]",

CONTRIBUTING.md

@@ -55,13 +55,12 @@ MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/ja
 To run the Yarn frontend build, after [building the WAR file](#building-the-war-file), add the downloaded versions of Node and Yarn to your path:
 
 ```sh
-export PATH=$PWD/war/node:$PWD/war/node/yarn/dist/bin:$PATH
+export PATH=$PWD/node:$PWD/node/yarn/dist/bin:$PATH
 ```
 
 Then you can run Yarn with e.g.
 
 ```sh
-cd war
 yarn
 ```
 
@@ -75,10 +74,9 @@ On one terminal, start a development server that will not process frontend asset
 MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run -Dskip.yarn
 ```
 
-On another terminal, move to the `war` folder and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
+Open another terminal and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
 
 ```sh
-cd war
 yarn start
 ```
 
@@ -113,14 +111,12 @@ mvn spotless:apply
 To view frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
 
 ```sh
-cd war
 yarn lint
 ```
 
 To fix frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
 
 ```sh
-cd war
 yarn lint:fix
 ```
 

core/src/main/java/hudson/model/TimeZoneProperty.java

@@ -62,6 +62,11 @@ public String getDisplayName() {
             return Messages.TimeZoneProperty_DisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.TimeZoneProperty_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new TimeZoneProperty();

core/src/main/java/hudson/model/UserPropertyDescriptor.java

@@ -26,6 +26,7 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.model.userproperty.UserPropertyCategory;
 import java.util.Optional;
 import org.jenkinsci.Symbol;
@@ -126,4 +127,15 @@ public boolean isEnabled() {
     protected @CheckForNull String getUserPropertyCategoryAsString() {
         return null;
     }
+
+    /**
+     * Optional description for the configurable object
+     * Displays as plain text
+     *
+     * @since TODO
+     */
+    @Nullable
+    public String getDescription() {
+        return null;
+    }
 }

core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java

@@ -65,6 +65,11 @@ public String getDisplayName() {
             return Messages.consoleUrlProviderDisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            return Messages.consoleUrlProviderDisplayName_Description();
+        }
+
         @Override
         public UserProperty newInstance(User user) {
             return new ConsoleUrlProviderUserProperty();

core/src/main/resources/hudson/PluginManager/installed.jelly

@@ -71,7 +71,7 @@ THE SOFTWARE.
 
       <j:choose>
         <j:when test="${noPlugins}">
-          <l:notice icon="symbol-plugins" text="${%No plugins installed}" />
+          <l:notice icon="symbol-plugins" title="${%No plugins installed}" />
         </j:when>
         <j:otherwise>
           <table id="plugins" class="jenkins-table sortable">

core/src/main/resources/hudson/PluginManager/updates.jelly

@@ -230,7 +230,7 @@ THE SOFTWARE.
             </table>
           </j:when>
           <j:otherwise>
-            <l:notice icon="symbol-up-to-date" text="${%No updates available}" />
+            <l:notice icon="symbol-up-to-date" title="${%No updates available}" />
           </j:otherwise>
         </j:choose>
         <d:invokeBody/>

core/src/main/resources/hudson/logging/LogRecorder/index.jelly

@@ -67,7 +67,7 @@ THE SOFTWARE.
     </l:app-bar>
 
     <j:if test="${noLogs}">
-      <l:notice text="${%No logs available}" icon="symbol-journal" />
+      <l:notice title="${%No logs available}" icon="symbol-journal" />
     </j:if>
 
     <t:logRecords logRecords="${it.logRecords}"/>

core/src/main/resources/hudson/model/Messages.properties

@@ -408,7 +408,8 @@ Jenkins.IsRestarting=Jenkins is restarting
 User.IllegalUsername="{0}" is prohibited as a username for security reasons.
 User.IllegalFullname="{0}" is prohibited as a full name for security reasons.
 
-TimeZoneProperty.DisplayName=User Defined Time Zone
+TimeZoneProperty.DisplayName=Time zone
+TimeZoneProperty.Description=Select a time zone to use rather than the system default
 TimeZoneProperty.DisplayDefaultTimeZone=Default
 TimeZoneProperty.current_time_in_=Current time in {0}: {1}
 TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}

core/src/main/resources/hudson/model/TimeZoneProperty/config.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:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry field="timeZoneName" title="${%title}">
+  <f:entry field="timeZoneName">
     <f:select />
   </f:entry>
 </j:jelly>

core/src/main/resources/hudson/model/View/noJob.jelly

@@ -23,9 +23,10 @@ THE SOFTWARE.
 -->
 
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-    ${%description_1}
-    <j:if test="${it.hasPermission(it.CONFIGURE)}">
-        ${%description_2}
-    </j:if>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
+    <l:notice title="${%description_1}" icon="symbol-weather-icon-health-00to19">
+        <j:if test="${it.hasPermission(it.CONFIGURE)}">
+            ${%description_2}
+        </j:if>
+    </l:notice>
 </j:jelly>