From ce02fd7a6b15d8685351d822636f18092e54b02c Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Tue, 7 Apr 2020 01:08:20 +0200
Subject: [PATCH] Improve the 'noJob' view immediately after setup

---
 .../hudson/model/AllView/noJob.groovy         | 44 ++++++++++++++++
 .../hudson/model/AllView/noJob.jelly          | 52 -------------------
 .../hudson/model/AllView/noJob.properties     | 12 +++--
 war/src/main/less/base/style.less             |  3 +-
 4 files changed, 55 insertions(+), 56 deletions(-)
 create mode 100644 core/src/main/resources/hudson/model/AllView/noJob.groovy
 delete mode 100644 core/src/main/resources/hudson/model/AllView/noJob.jelly

diff --git a/core/src/main/resources/hudson/model/AllView/noJob.groovy b/core/src/main/resources/hudson/model/AllView/noJob.groovy
new file mode 100644
index 0000000000..c7f66be608
--- /dev/null
+++ b/core/src/main/resources/hudson/model/AllView/noJob.groovy
@@ -0,0 +1,44 @@
+package hudson.model.AllView
+
+import hudson.model.Computer
+import hudson.model.Item
+import jenkins.model.Jenkins
+
+div {
+    h1(_("Welcome to Jenkins!"))
+
+    if (my.owner == Jenkins.get()) {
+        // we're a top-level 'All' view
+        if (Jenkins.get().hasPermission(Computer.CREATE) && Jenkins.get().clouds.isEmpty() && Jenkins.get().getNodes().isEmpty()) {
+            div(class: 'call-to-action') {
+                if (Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
+                    raw(_("distributedBuildsWithCloud"))
+                } else {
+                    raw(_("distributedBuilds"))
+                }
+            }
+        }
+        if (my.owner.hasPermission(Item.CREATE)) {
+            div(class: 'call-to-action') {
+                raw(_("newJob"))
+            }
+        }
+    } else {
+        // we're in a folder
+        if (my.owner.hasPermission(Item.CREATE)) {
+            div(class: 'call-to-action') {
+                raw(_("newJob"))
+            }
+        }
+    }
+
+    if (h.isAnonymous() && !my.owner.hasPermission(Item.CREATE)) {
+        div(class:'call-to-action') {
+            raw(_("login", rootURL, app.securityRealm.loginUrl, request.requestURI))
+            if (app.securityRealm.allowsSignup()) {
+                text(" ") // TODO make this nicer
+                raw(_("signup"))
+            }
+        }
+    }
+}
diff --git a/core/src/main/resources/hudson/model/AllView/noJob.jelly b/core/src/main/resources/hudson/model/AllView/noJob.jelly
deleted file mode 100644
index 0c9e0c26a9..0000000000
--- a/core/src/main/resources/hudson/model/AllView/noJob.jelly
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<?jelly escape-by-default='true'?>
-<div>
-  <!--
-    This is a good place to add "welcome" materials, like pointers to the website and etc
-  -->
-  <h1>${%Welcome to Jenkins!}</h1>
-
-  <j:choose xmlns:j="jelly:core">
-    <!-- Only show the create new jobs link to those users that have permission to use it. -->
-    <j:getStatic var="permission" className="hudson.model.Item" field="CREATE"/>
-    <j:when test="${h.hasPermission(it.owner, permission)}">
-      <div class="call-to-action">${%newJob}</div>
-    </j:when>
-    <j:otherwise>
-      <!-- Offer anonymous users the chance to login, then they can create jobs. -->
-      <j:if test="${h.isAnonymous()}">
-        <div class="call-to-action">
-        ${%login(rootURL, app.securityRealm.loginUrl, request.requestURI)}
-        <!-- Also offer them the opportunity to sign-up for an account, if this facility is available. -->
-        <j:if test="${app.securityRealm.allowsSignup()}">
-          ${%signup}
-        </j:if>
-        </div>
-      </j:if>
-    </j:otherwise>
-  </j:choose>
-
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/AllView/noJob.properties b/core/src/main/resources/hudson/model/AllView/noJob.properties
index a314eec51f..a56ca9a8a6 100644
--- a/core/src/main/resources/hudson/model/AllView/noJob.properties
+++ b/core/src/main/resources/hudson/model/AllView/noJob.properties
@@ -20,8 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-newJob=Please <a href="newJob">create new jobs</a> to get started.
+newJob=<a href="newJob">Create a job</a> to start building your software project.
 
-login=<a href="{0}/{1}?from={2}">Log in</a> to create new jobs.
+distributedBuildsWithCloud=<a href="computer/new">Create an agent</a> or <a href="configureClouds">configure a cloud</a> to set up distributed builds. \
+  <a href="https://jenkins.io/redirects/distributed-builds">Learn more</a>.
 
-signup=If you don\u2019t already have an account, you can <a href="signup">sign-up</a> now.
+distributedBuilds=<a href="computer/new">Create an agent</a> to set up distributed builds. \
+  <a href="https://jenkins.io/redirects/distributed-builds">Learn more</a>.
+
+login=You are not logged in. <a href="{0}/{1}?from={2}">Log in now</a> to view or create jobs.
+
+signup=If you don\u2019t already have an account, you can <a href="signup">sign up</a> now.
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index 177ac40881..e81298e081 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -196,7 +196,8 @@ a.tip:hover span {
 }
 
 .call-to-action {
-  display: inline-block;
+  display: table;
+  margin-bottom: 5px;
   padding: 10px;
   background-color: #cdf0f2;
   border-left: 4px solid #577baa;
-- 
GitLab