From 2971155ccb5e76cd998cb5422f2fe47885e151ed Mon Sep 17 00:00:00 2001
From: Vincent Latombe <vincent@latombe.net>
Date: Sat, 9 Sep 2023 05:48:51 +0200
Subject: [PATCH] Make branding overridable in signin/login page (#8462)

* Move resources from DefaultSimplePageDecorator to SimplePageDecorator to ease implementation.
---
 .../jenkins/model/SimplePageDecorator.java    | 19 ++++++++++++
 .../HudsonPrivateSecurityRealm/signup.jelly   |  9 ++----
 .../jenkins/model/Jenkins/login.jelly         |  9 ++----
 .../SimplePageDecorator/simple-branding.jelly | 30 +++++++++++++++++++
 .../simple-head.jelly                         |  0
 .../simple-header.jelly                       |  0
 .../simple-header_fr.properties               |  0
 .../simple-header_it.properties               |  0
 .../simple-header_ja.properties               |  0
 .../simple-header_pl.properties               |  0
 .../simple-header_pt_BR.properties            |  0
 .../simple-header_tr.properties               |  0
 .../simple-header_zh_TW.properties            |  0
 13 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 core/src/main/resources/jenkins/model/SimplePageDecorator/simple-branding.jelly
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-head.jelly (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header.jelly (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_fr.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_it.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_ja.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_pl.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_pt_BR.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_tr.properties (100%)
 rename core/src/main/resources/jenkins/model/{DefaultSimplePageDecorator => SimplePageDecorator}/simple-header_zh_TW.properties (100%)

diff --git a/core/src/main/java/jenkins/model/SimplePageDecorator.java b/core/src/main/java/jenkins/model/SimplePageDecorator.java
index 7a0639ee774a..29e08679506c 100644
--- a/core/src/main/java/jenkins/model/SimplePageDecorator.java
+++ b/core/src/main/java/jenkins/model/SimplePageDecorator.java
@@ -35,6 +35,25 @@
  * <p>
  * This class provides a few hooks to augment the HTML of the login page.
  *
+ * <dl>
+ *  <dt>simple-branding.jelly</dt>
+ *  <dd>
+ *    This view contributes to the branding section, usually located on the left side of the login/register pages.
+ *  </dd>
+ *  <dt>simple-footer.jelly</dt>
+ *  <dd>
+ *    This view contributes to the footer section, located below the login/register form.
+ *  </dd>
+ *  <dt>simple-head.jelly</dt>
+ *  <dd>
+ *    This view contributes to the head section.
+ *  </dd>
+ *  <dt>simple-header.jelly</dt>
+ *  <dd>
+ *    This view contributes to the header section just above the login/register form.
+ *  </dd>
+ * </dl>
+ *
  * @since 2.128
  */
 public class SimplePageDecorator extends Descriptor<SimplePageDecorator> implements ExtensionPoint, Describable<SimplePageDecorator> {
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
index 1e550e3a1497..52e13b720fc7 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -48,19 +48,16 @@ THE SOFTWARE.
         <!-- mobile friendly layout -->
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <!-- css styling, will fallback to default implementation -->
-        <st:include it="${simpleDecorator}" page="simple-head.jelly" optional="true"/>
+        <st:include it="${simpleDecorator}" page="simple-head.jelly" />
         <script src="${resURL}/jsbundles/pages/register.js" type="text/javascript" defer="true" />
       </head>
       <body class="app-sign-in-register">
-        <section class="app-sign-in-register__branding">
-          <div class="app-sign-in-register__branding__starburst"></div>
-          <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
-        </section>
+        <st:include it="${simpleDecorator}" page="simple-branding.jelly" />
         <main id="main-panel" class="app-sign-in-register__content">
           <div class="app-sign-in-register__content-inner">
             <h1>${%Register}</h1>
 
-            <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+            <st:include it="${simpleDecorator}" page="simple-header.jelly" />
 
             <template id="i18n" data-strength-strong="${%Strong}"
                                 data-strength-moderate="${%Moderate}"
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
index 1ad3fd1d5f15..c9071d5308cd 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/login.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -59,7 +59,7 @@ THE SOFTWARE.
         <!-- mobile friendly layout -->
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <!-- css styling, will fallback to default implementation -->
-        <st:include it="${simpleDecorator}" page="simple-head.jelly" optional="true"/>
+        <st:include it="${simpleDecorator}" page="simple-head.jelly" />
       </head>
       <body class="app-sign-in-register">
         <j:choose>
@@ -67,15 +67,12 @@ THE SOFTWARE.
             <st:include it="${it.setupWizard}" page="authenticate-security-token"/>
           </j:when>
           <j:otherwise>
-            <section class="app-sign-in-register__branding">
-              <div class="app-sign-in-register__branding__starburst"></div>
-              <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
-            </section>
+            <st:include it="${simpleDecorator}" page="simple-branding.jelly" />
             <main id="main-panel" class="app-sign-in-register__content">
               <div class="app-sign-in-register__content-inner">
                 <h1>Sign in to Jenkins</h1>
 
-                <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+                <st:include it="${simpleDecorator}" page="simple-header.jelly" />
 
                 <form name="login" action="${it.securityRealm.authenticationGatewayUrl}"
                     method="post">
diff --git a/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-branding.jelly b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-branding.jelly
new file mode 100644
index 000000000000..20997b85bb24
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-branding.jelly
@@ -0,0 +1,30 @@
+<!--
+The MIT License
+
+Copyright (c) 2023, CloudBees, Inc.
+
+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'?>
+<j:jelly xmlns:j="jelly:core">
+  <section class="app-sign-in-register__branding">
+    <div class="app-sign-in-register__branding__starburst"></div>
+    <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
+  </section>
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-head.jelly b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-head.jelly
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-head.jelly
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-head.jelly
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header.jelly
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header.jelly
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_fr.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_fr.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_fr.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_fr.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_it.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_it.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_it.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_it.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_ja.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_ja.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_ja.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_ja.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_pl.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_pl.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_pl.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_pl.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_pt_BR.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_pt_BR.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_pt_BR.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_tr.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_tr.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_tr.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_tr.properties
diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_zh_TW.properties b/core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_zh_TW.properties
similarity index 100%
rename from core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header_zh_TW.properties
rename to core/src/main/resources/jenkins/model/SimplePageDecorator/simple-header_zh_TW.properties