Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-34670] In order to verify an use case, the Setup Wizard has …
…beed adapted. html.jelly is not longer needed
- Loading branch information
Showing
5 changed files
with
71 additions
and
238 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 10 additions & 6 deletions
16
core/src/main/resources/jenkins/install/SetupWizard/index.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,11 @@ | ||
| <?jelly escape-by-default='true'?> | ||
| <l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
| <l:main-panel> | ||
| <div class="plugin-setup-wizard-container"></div> | ||
| <st:include page="wizard-ui"/> | ||
| </l:main-panel> | ||
| </l:html> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form"> | ||
|
|
||
| <l:layout norefresh="true" type="full-screen" title="${it.displayName}"> | ||
| <l:main-panel> | ||
| <div class="plugin-setup-wizard-container"></div> | ||
| <st:include page="wizard-ui"/> | ||
| </l:main-panel> | ||
| </l:layout> | ||
|
|
||
| </j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 38 additions & 41 deletions
79
core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,52 @@ | ||
| <!-- | ||
| This is used to create the first user. | ||
| --> | ||
| <?jelly escape-by-default='true'?> | ||
| <l:html norefresh="true" title="${it.displayName}" xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form"> | ||
|
|
||
| <l:main-panel> | ||
| <l:layout norefresh="true" type="full-screen" title="${it.displayName}"> | ||
| <l:main-panel> | ||
| <link rel="stylesheet" href="${resURL}/css/google-fonts/roboto/css/roboto.css" type="text/css" /> | ||
| <style type="text/css"> | ||
|
|
||
| <link rel="stylesheet" href="${resURL}/css/google-fonts/roboto/css/roboto.css" type="text/css" /> | ||
|
|
||
| <style type="text/css"> | ||
|
|
||
| #main-panel { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| tr td { | ||
| padding-bottom: 2px; | ||
| } | ||
| body { | ||
| #create-admin-user { | ||
| padding: 20px 20px 20px 100px; | ||
| font-family: 'roboto'; | ||
| } | ||
| form > div { | ||
| margin: 8px; | ||
| } | ||
|
|
||
| #create-admin-user form > div { | ||
| margin: 0 !important; | ||
| } | ||
| h1 { | ||
| } | ||
|
|
||
| #create-admin-user h1 { | ||
| font-family: 'roboto', sans-serif; | ||
| font-size: 48px; | ||
| margin-top: 30px; | ||
| font-weight: 500; | ||
| } | ||
| h1 img { | ||
| position: absolute; | ||
| right: -80px; | ||
| top: 38px; | ||
| } | ||
| tr td, input { | ||
| } | ||
|
|
||
| #create-admin-user tr td { | ||
| padding-bottom: 2px; | ||
| } | ||
|
|
||
| #create-admin-user tr td, #create-admin-user input { | ||
| line-height: 25px; | ||
| margin-bottom: 6px; | ||
| } | ||
| input[type=text], input[type=password] { | ||
| } | ||
|
|
||
| #create-admin-user input[type=text], input[type=password] { | ||
| border: 1px solid #ddd; | ||
| border-radius: 2px; | ||
| padding: 1px 8px; | ||
| } | ||
| </style> | ||
| <form action="${rootURL}/setupWizard/createAdminUser" method="post"> | ||
| <local:_entryForm it="${app.securityRealm}" host="${app.securityRealm}" title="${%Create First Admin User}" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" /> | ||
| <script> | ||
| $('username').focus(); | ||
| </script> | ||
| </form> | ||
| </l:main-panel> | ||
| </l:html> | ||
| } | ||
| </style> | ||
|
|
||
| <div id="create-admin-user"> | ||
| <form action="${rootURL}/setupWizard/createAdminUser" method="post"> | ||
| <local:_entryForm it="${app.securityRealm}" host="${app.securityRealm}" title="${%Create First Admin User}" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" /> | ||
| <script> | ||
| $('username').focus(); | ||
| </script> | ||
| </form> | ||
| </div> | ||
| </l:main-panel> | ||
| </l:layout> | ||
|
|
||
| </j:jelly> |
This file was deleted.
Oops, something went wrong.