Skip to content
Permalink
Browse files
[JENKINS-34670] In order to verify an use case, the Setup Wizard has …
…beed adapted. html.jelly is not longer needed
  • Loading branch information
recena committed Feb 26, 2017
1 parent fe07641 commit abd7a8f460748bfff31ed75f798d7362e181e169
@@ -1,38 +1,34 @@
<?jelly escape-by-default='true'?>
<l:html norefresh="true" title="${app.instance.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:layout norefresh="true" type="full-screen" title="${app.instance.displayName}">
<l:main-panel>
<st:include page="client-scripts" />
<form action="${app.instance.securityRealm.authenticationGatewayUrl}" method="POST">
<st:include page="client-scripts" />
<form action="${app.instance.securityRealm.authenticationGatewayUrl}" method="POST">
<input type="hidden" name="from" value="${request.getParameter('from')}" />
<div class="plugin-setup-wizard bootstrap-3">
<div class="modal fade in" style="display: block;">
<div class="modal-dialog">
<div class="modal-content">

<div class="modal-header">
<h4 class="modal-title">${%authenticate-security-token.getting.started}</h4>
</div>
<div class="modal-body">
<i class="water-mark icon-service"></i>
<div class="jumbotron welcome-panel offline">

<h1>${%authenticate-security-token.unlock.jenkins}</h1>
<p>
${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}
</p>
<p>${%jenkins.install.findSecurityTokenMessage(it.initialAdminPasswordFile)}</p>
<p>${%authenticate-security-token.copy.password}</p>
<j:if test="${error}">
<div class="alert alert-danger">
<strong>${%authenticate-security-token.error} </strong>
${%authenticate-security-token.password.incorrect}
<strong>${%authenticate-security-token.error}</strong> ${%authenticate-security-token.password.incorrect}
</div>
</j:if>
<div class="form-group ${error ? 'has-error' : ''}">
<label class="control-label" for="security-token">${%authenticate-security-token.password.administrator}</label>
<input name="j_username" value="${app.setupWizard.initialSetupAdminUserName}" type="hidden"/>
<input id="security-token" class="form-control" type="password" name="j_password"/>
<label class="control-label" for="security-token">${%authenticate-security-token.password.administrator}</label>
<input name="j_username" value="${app.setupWizard.initialSetupAdminUserName}" type="hidden"/>
<input id="security-token" class="form-control" type="password" name="j_password"/>
</div>

</div>
</div>
<div class="modal-footer">
@@ -42,6 +38,8 @@
</div>
</div>
</div>
</form>
</l:main-panel>
</l:html>
</form>
</l:main-panel>
</l:layout>

</j:jelly>
@@ -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>
@@ -1,6 +1,8 @@
<?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>
<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>
<h1>${%HTTP Proxy Configuration}</h1>
<f:form method="post" action="/pluginManager/proxyConfigure" name="proxyConfigure">
<j:scope>
@@ -9,5 +11,7 @@
<st:include from="${descriptor}" page="${descriptor.configPage}" />
</j:scope>
</f:form>
</l:main-panel>
</l:html>
</l:main-panel>
</l:layout>

</j:jelly>
@@ -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.

0 comments on commit abd7a8f

Please sign in to comment.