Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Aug 8, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
7 changes: 1 addition & 6 deletions core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 1 deletion core/src/main/resources/jenkins/model/Jenkins/login.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand Down
Loading