root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Move simple-header out
This commit is contained in:
Jan Faracik 2023-08-08 13:06:42 +01:00 committed by GitHub
parent ce7f89712d
commit 4ccb66b0f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
View File

@ -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}"

7
core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly
View File

@ -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" />

7
core/src/main/resources/jenkins/model/Jenkins/login.jelly
View File

@ -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}">