Update css and page navigation
This commit is contained in:
olblak
parent
c1fa0bdd0c
commit
cf20102bef
@ -1,22 +1,39 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Administration">
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
|
||||
<p>
|
||||
Confirm creating the following user
|
||||
</p>
|
||||
<form method="post" action="doSignup">
|
||||
<h5>User ID</h5>
|
||||
<input type="text" name="userid" value="${request.getParameter('userId')}" class="text" />
|
||||
<div class="form-group">
|
||||
<label>User ID</label>
|
||||
<input type="text" name="userid" value="${request.getParameter('userId')}" class="form-control text" placeholder="Userid" />
|
||||
</div>
|
||||
|
||||
<h5>First Name</h5>
|
||||
<input type="text" name="firstName" value="${request.getParameter('firstName')}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>First Name</label>
|
||||
<input type="text" name="firstName" value="${request.getParameter('firstName')}" class="form-control text" placeholder="First Name" />
|
||||
</div>
|
||||
|
||||
<h5>Last Name</h5>
|
||||
<input type="text" name="lastName" value="${request.getParameter('lastName')}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>Last Name</label>
|
||||
<input type="text" name="lastName" value="${request.getParameter('lastName')}" class="form-control text" placeholder="Last Name"/>
|
||||
</div>
|
||||
|
||||
<h5>E-mail</h5>
|
||||
<input type="text" name="email" value="${request.getParameter('email')}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>E-mail</label>
|
||||
<input type="email" name="email" value="${request.getParameter('email')}" class="form-control text" placeholder="Last Name"/>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-default">Sign Up</button>
|
||||
|
||||
<input type="submit" style="margin-top:2em; display:block"/>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-8">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</t:layout>
|
||||
</j:jelly>
|
||||
|
||||
@ -1,36 +1,18 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Account self-service app">
|
||||
<div style="width: 100%;">
|
||||
<p>
|
||||
You can create/manage your user account that you use for accessing
|
||||
<a href="http://wiki.jenkins-ci.org/" target="_top">Wiki</a> and <a href="http://issues.jenkins-ci.org/" target="_top">JIRA</a>,
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
#account-menu H1 {
|
||||
margin: 1rem;
|
||||
}
|
||||
</style>
|
||||
<p>
|
||||
You can create/manage your user account that you use for accessing
|
||||
<a href="http://wiki.jenkins-ci.org/" target="_top">Wiki</a> and <a href="http://issues.jenkins-ci.org/" target="_top">JIRA</a>,
|
||||
</p>
|
||||
|
||||
<div id="account-menu">
|
||||
<h1><a href="signup">Create a new account</a></h1>
|
||||
|
||||
<h1><a href="passwordReset">Reset the password</a></h1>
|
||||
|
||||
<h1><a href="myself/">Update your profile</a></h1>
|
||||
|
||||
<j:if test="${it.isLoggedIn()}">
|
||||
<h1><a href="logout">Logout</a></h1>
|
||||
</j:if>
|
||||
|
||||
<j:if test="${it.boardElection.open}">
|
||||
<h1><a href="election/">Board Election</a></h1>
|
||||
</j:if>
|
||||
|
||||
|
||||
<j:if test="${it.isAdmin()}">
|
||||
<h1><a href="admin/">Administration</a></h1>
|
||||
<j:if test="${not it.isLoggedIn()}">
|
||||
<script type="text/javascript">
|
||||
window.location.href = "login"
|
||||
</script>
|
||||
<h1><a href="login">Login</a></h1>
|
||||
<h1><a href="signup">Create a new account</a></h1>
|
||||
<h1><a href="passwordReset">Reset the password</a></h1>
|
||||
</j:if>
|
||||
</div>
|
||||
</t:layout>
|
||||
|
||||
@ -1,25 +1,35 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Login">
|
||||
<h1>Login</h1>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<h1 class="text-center">Login</h1>
|
||||
|
||||
<form method="post" action="doLogin">
|
||||
<h5>User ID</h5>
|
||||
<input type="text" name="userid" class="text" id="userid"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="userid">Login</label>
|
||||
<input type="text" name="userid" class="form-control text" id="userid" placeholder="Userid"/>
|
||||
</div>
|
||||
|
||||
<h5>Password</h5>
|
||||
<input type="password" name="password" class="text"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="login_password">Password</label>
|
||||
<input type="password" id="login_password" name="password" placeholder="Password" class="form-control text"/>
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="from" value="${request.getParameter('from')}"/>
|
||||
|
||||
<input type="submit" style="margin-top:2em; display:block"/>
|
||||
<button type="submit" class="btn btn-default btn-lg btn-block">Login</button>
|
||||
</form>
|
||||
|
||||
(<a href="signup">Want to sign up?</a> or <a href="passwordReset">forgot the password?</a>)
|
||||
<small><a href="signup">Sign up?</a> - <a href="passwordReset">Forgot password</a></small>
|
||||
|
||||
<script>
|
||||
window.onload = function() {
|
||||
document.getElementById('userid').focus();
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
</div>
|
||||
</div>
|
||||
</t:layout>
|
||||
</j:jelly>
|
||||
|
||||
@ -1,21 +1,30 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Reset your password">
|
||||
<h1>Reset your password</h1>
|
||||
<t:layout title="Reset password">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
|
||||
<h1>Reset password</h1>
|
||||
|
||||
<form method="post" action="doPasswordReset">
|
||||
<h5>User ID</h5>
|
||||
<input type="text" name="id" class="text"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only">Email</label>
|
||||
<input type="text" name="id" class="form-control text" placeholder="UserId or Email"/>
|
||||
</div>
|
||||
|
||||
<p class="description">
|
||||
You can also specify your e-mail address that you've registered with us.
|
||||
(Except for those accounts that are migrated from java.net, whose e-mail address is set to ID@java.net,
|
||||
and not your real e-mail address.)
|
||||
</p>
|
||||
|
||||
<input type="submit" value="Send me a new password via e-mail" style="margin-top:2em; display:block"/>
|
||||
<button type="submit" class="btn btn-default btn-lg btn-block">Reset password</button>
|
||||
|
||||
<p>
|
||||
If you can't figure this out, contact us to get your account recovered.
|
||||
</p>
|
||||
<small>If you can't figure this out, contact us to get your account recovered.</small>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</t:layout>
|
||||
</j:jelly>
|
||||
|
||||
@ -1,38 +1,56 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Sign up">
|
||||
<h1>Sign up</h1>
|
||||
<div class="row">
|
||||
<div class="col-sm-6 block-center">
|
||||
|
||||
<h1 class="text-center" >Sign up</h1>
|
||||
|
||||
<form method="post" action="doSignup">
|
||||
<h5>User ID</h5>
|
||||
<input type="text" name="userid" class="text"/>
|
||||
<p class="description">
|
||||
Only alphabets, numbers, and '_' is allowed.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="userid">User ID</label>
|
||||
<input type="text" name="userid" id="userid" class="form-control text" placeholder="Userid"/>
|
||||
<span id="helpBlock" class="help-block text-center">
|
||||
Only alphabets, numbers, and '_' is allowed.
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<h5>First Name</h5>
|
||||
<input type="text" name="firstName" class="text"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="firstname">First Name</label>
|
||||
<input type="text" name="firstName" id="firstname" class="form-control text" placeholder="First Name"/>
|
||||
</div>
|
||||
|
||||
<h5>Last Name</h5>
|
||||
<input type="text" name="lastName" class="text"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="lastname" >Last Name</label>
|
||||
<input type="text" id='lastname' name="lastName" class="form-control text" placeholder="Last Name"/>
|
||||
</div>
|
||||
|
||||
<h5>E-mail</h5>
|
||||
<input type="text" name="email" class="text"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="email">E-mail</label>
|
||||
<input type="email" name="email" id="email" class="form-control text" placeholder="Email"/>
|
||||
</div>
|
||||
|
||||
<h5>What do you use Jenkins for?</h5>
|
||||
<input type="text" name="usedFor" class="text"/>
|
||||
<input id="hp" type="text" name="hp"/>
|
||||
<div class="form-group">
|
||||
<label class="sr-only" for="usedFor">Usage</label>
|
||||
<input type="text" name="usedFor" id="usedfor" class="form-control text" placeholder="What do you use Jenkins for?"/>
|
||||
</div>
|
||||
|
||||
<input id="hp" type="text" name="hp"/>
|
||||
<script>
|
||||
<![CDATA[
|
||||
document.getElementById("hp").style.display = "none";
|
||||
]]>
|
||||
<![CDATA[document.getElementById("hp").style.display = "none";]]>
|
||||
</script>
|
||||
|
||||
<j:if test="${it.captchaPublicKey()!=null}">
|
||||
<h5>Captcha</h5>
|
||||
<label class="sr-only" for="captcha">Captcha</label>
|
||||
<script src="https://www.google.com/recaptcha/api.js" async="true" defer="true"></script>
|
||||
<div class="g-recaptcha" data-sitekey="${it.captchaPublicKey()}"></div>
|
||||
<div class="g-recaptcha" id="captcha" data-sitekey="${it.captchaPublicKey()}"></div>
|
||||
</j:if>
|
||||
<br/>
|
||||
<input type="submit" style="margin-top:2em; display:block"/>
|
||||
<button type="submit" class="btn btn-default btn-lg btn-block">Sign Up</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</t:layout>
|
||||
</j:jelly>
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Board Election">
|
||||
|
||||
<j:choose>
|
||||
<j:when test="${it.open}">
|
||||
|
||||
<h1>Board Election</h1>
|
||||
<p>
|
||||
Use drag and drop to order candidates by your preference for <a href="https://wiki.jenkins-ci.org/display/JENKINS/Board+Election+Process">Board election</a>.
|
||||
</p>
|
||||
<p class="help-block"> Use drag and drop to order candidates by your preference for <a href="https://wiki.jenkins-ci.org/display/JENKINS/Board+Election+Process">Board election</a>. </p>
|
||||
|
||||
<link rel="stylesheet" href="https://jenkins.io/assets/bower/jquery-ui/themes/base/jquery-ui.min.css"/>
|
||||
<script src="https://jenkins.io/assets/bower/jquery-ui/jquery-ui.min.js"></script>
|
||||
<script>
|
||||
$( function() {
|
||||
$( "#sortable" ).sortable();
|
||||
@ -25,26 +20,22 @@
|
||||
$("#vote_form").submit();
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
#sortable { list-style-type: none; margin: 0; padding: 0; width: 60%; cursor: move }
|
||||
#sortable li { margin: 0 3px 3px 5px; padding: 2px; padding-left:15px; font-size: 1.4em; height: 60px; }
|
||||
</style>
|
||||
|
||||
<ul id="sortable">
|
||||
<j:forEach var="c" indexVar="i" items="${it.candidates}" >
|
||||
<li id="${i}" class="ui-state-default">
|
||||
${c}
|
||||
<div style="float:right; font-size:0.8em; cursor:pointer" onclick="this.parentElement.remove()"><i class="fa fa-ban" aria-hidden="true"></i></div>
|
||||
</li>
|
||||
</j:forEach>
|
||||
</ul>
|
||||
<form method="post" action="vote" id="vote_form" >
|
||||
|
||||
<p style="width: 60%; text-align:right; margin-top:50px">
|
||||
<form method="post" action="vote" id="vote_form">
|
||||
<input type="hidden" name="vote"/>
|
||||
</form>
|
||||
<button onclick="vote()">Vote</button>
|
||||
</p>
|
||||
<ul id="sortable" class="list-group">
|
||||
<j:forEach var="c" indexVar="i" items="${it.candidates}" >
|
||||
<li id="${i}" class="list-group-item text-center text-capitalize" >
|
||||
<span class="glyphicon glyphicon-sort pull-left" aria-hidden="true"></span>
|
||||
${c}
|
||||
<span onclick="this.parentElement.remove()" class="glyphicon glyphicon-remove pull-right"></span>
|
||||
</li>
|
||||
</j:forEach>
|
||||
</ul>
|
||||
|
||||
<input type="hidden" name="vote"/>
|
||||
</form>
|
||||
<button onclick="vote()" class="btn btn-default btn-lg pull-center center-block">Vote</button>
|
||||
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
@ -53,9 +44,6 @@
|
||||
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
|
||||
|
||||
|
||||
</t:layout>
|
||||
|
||||
</j:jelly>
|
||||
</j:jelly>
|
||||
|
||||
@ -1,45 +1,60 @@
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:t="/org/jenkinsci/account/taglib">
|
||||
<t:layout title="Your Profile">
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<h1>Your Profile</h1>
|
||||
|
||||
<form method="post" action="update">
|
||||
<h5>User ID</h5>
|
||||
<input type="text" readonly="true" value="${it.userId}" class="text" disabled="true"/>
|
||||
<div class="form-group">
|
||||
<label>User ID</label>
|
||||
<input type="text" readonly="true" value="${it.userId}" class="form-control text" disabled="true"/>
|
||||
</div>
|
||||
|
||||
<h5>First Name</h5>
|
||||
<input type="text" name="firstName" value="${it.firstName}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>First Name</label>
|
||||
<input type="text" name="firstName" value="${it.firstName}" class="form-control text"/>
|
||||
</div>
|
||||
|
||||
<h5>Last Name</h5>
|
||||
<input type="text" name="lastName" value="${it.lastName}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>Last Name</label>
|
||||
<input type="text" name="lastName" value="${it.lastName}" class="form-control text"/>
|
||||
</div>
|
||||
|
||||
<h5>E-mail</h5>
|
||||
<input type="text" name="email" value="${it.email}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>E-mail</label>
|
||||
<input type="text" name="email" value="${it.email}" class="form-control text"/>
|
||||
</div>
|
||||
|
||||
<h5>GitHub ID</h5>
|
||||
<input type="text" name="githubId" value="${it.githubId}" class="text"/>
|
||||
<div class="form-group">
|
||||
<label>GitHub ID</label>
|
||||
<input type="text" name="githubId" value="${it.githubId}" class="form-control text"/>
|
||||
</div>
|
||||
|
||||
<h5>SSH Public Keys</h5>
|
||||
<textarea name="sshKeys" style="width:80%; height:10em;">${it.sshKeys}</textarea>
|
||||
<div class="form-group">
|
||||
<label>SSH Public Keys</label>
|
||||
<textarea class="form-control" rows="3">${it.sshKeys}</textarea>
|
||||
</div>
|
||||
|
||||
<div style="height:2em"></div>
|
||||
<fieldset style="width:25em">
|
||||
<legend>Change Password</legend>
|
||||
<p class="description">
|
||||
To update your password, please type your current password as well as new one for security.
|
||||
Leave this empty to keep the current password.
|
||||
</p>
|
||||
<legend>Change Password</legend>
|
||||
<p class="description">
|
||||
To update your password, please type your current password as well as new one for security.
|
||||
Leave this empty to keep the current password.
|
||||
</p>
|
||||
|
||||
<h5>Current Password</h5>
|
||||
<input type="password" name="password" value="" class="text"/>
|
||||
<label class="sr-only">Current Password</label>
|
||||
<input type="password" name="password" value="" class="form-control text" placeholder="Current Password"/>
|
||||
|
||||
<h5>New Password</h5>
|
||||
<input type="password" name="newPassword1" class="text"/>
|
||||
<label class="sr-only">New Password</label>
|
||||
<input type="password" name="newPassword1" class="form-control text" placeholder="New Password"/>
|
||||
|
||||
<h5>Confirm New Password</h5>
|
||||
<input type="password" name="newPassword2" class="text"/>
|
||||
</fieldset>
|
||||
<label class="sr-only">Confirm New Password</label>
|
||||
<input type="password" name="newPassword2" class="form-control text" placeholder="Confirm new password"/>
|
||||
|
||||
<input type="submit" style="margin-top:2em; display:block"/>
|
||||
<button type="submit" class="btn btn-default btn-lg btn-block">Update</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
</div>
|
||||
</div>
|
||||
</t:layout>
|
||||
</j:jelly>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
</st:documentation>
|
||||
<st:contentType value="text/html;charset=UTF-8" />
|
||||
|
||||
<html>
|
||||
<html style="height: 100%;">
|
||||
<head>
|
||||
<title>
|
||||
${attrs.title} | Jenkins
|
||||
@ -41,9 +41,10 @@
|
||||
<link href='https://jenkins.io/assets/bower/ionicons/css/ionicons.min.css' media='screen' rel='stylesheet'/>
|
||||
<link href='https://jenkins.io/css/footer.css' media='screen' rel='stylesheet'/>
|
||||
<link href='https://jenkins.io/css/font-awesome.min.css' media='screen' rel='stylesheet'/>
|
||||
<script src="/webjars/jquery/3.2.0/jquery.js"></script>
|
||||
<script src="/webjars/jquery-ui/1.12.1/jquery-ui.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script src='https://jenkins.io/assets/bower/jquery/jquery.js'></script>
|
||||
<body style="height: 100%;">
|
||||
<!-- starting partial toptoolbar.html.haml -->
|
||||
<nav class='navbar navbar-toggleable-md navbar-inverse top bg-inverse fixed-top' id='ji-toolbar'>
|
||||
<div class='container'>
|
||||
@ -183,12 +184,32 @@ Download
|
||||
<!-- ending partial toptoolbar.html.haml -->
|
||||
|
||||
|
||||
<div class='container'>
|
||||
<div class='row'>
|
||||
<div class="col-md-12">
|
||||
<d:invokeBody />
|
||||
</div>
|
||||
<div class='container' style="height: 60%;overflow: auto;">
|
||||
<div class='row'>
|
||||
<div class="col-sm-3 col-md-3">
|
||||
<div class='sidebar-nav tour'>
|
||||
<j:if test="${app.isLoggedIn() or it.isLoggedIn()}">
|
||||
<h4>Account</h4>
|
||||
<ul>
|
||||
<li><a href="/" class="active">Home</a></li>
|
||||
|
||||
<j:if test="${it.isAdmin() or app.isAdmin()}">
|
||||
<li><a href="/admin">Administration</a></li>
|
||||
</j:if>
|
||||
|
||||
<li><a href="/election">Board Election</a></li>
|
||||
<li><a href="/myself">Profile</a></li>
|
||||
<li><a href="/logout">Logout</a></li>
|
||||
</ul>
|
||||
</j:if>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-9 col-md-offset-3">
|
||||
<div class="main">
|
||||
<d:invokeBody />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user