[JENKINS-71238] New login page breaks login-theme-plugin (#8341)

Move simple-header out (cherry picked from commit 4ccb66b)
jenkinsci · Sep 2, 2023 · 5f47d53 · 5f47d53
1 parent 7d45cd4
commit 5f47d53
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -52,11 +52,16 @@ THE SOFTWARE.
         <script src="${resURL}/jsbundles/pages/register.js" type="text/javascript" defer="true" />
       </head>
       <body class="app-sign-in-register">
-        <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+        <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>
         <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" />
+
             <template id="i18n" data-strength-strong="${%Strong}"
                                 data-strength-moderate="${%Moderate}"
                                 data-strength-weak="${%Weak}"

diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly b/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly
@@ -22,9 +22,4 @@ 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>
+<j:jelly xmlns:j="jelly:core" />
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -67,11 +67,16 @@ THE SOFTWARE.
             <st:include it="${it.setupWizard}" page="authenticate-security-token"/>
           </j:when>
           <j:otherwise>
-            <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+            <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>
             <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" />
+
                 <form name="login" action="${it.securityRealm.authenticationGatewayUrl}"
                     method="post">
                   <j:if test="${error}">