Skip to content

Commit

Permalink
#899 Change the position of the button on the login page
Browse files Browse the repository at this point in the history
  • Loading branch information
koda-masaru committed Oct 10, 2017
1 parent 287b787 commit c5815ca
Showing 1 changed file with 64 additions and 63 deletions.
127 changes: 64 additions & 63 deletions src/main/webapp/WEB-INF/views/auth/form.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -19,73 +19,74 @@
<c:param name="PARAM_CONTENT">
<h4 class="title"><%= jspUtil.label("label.login") %></h4>

<div class="container">
<form class=""
action="<%=request.getContextPath()%>/signin"
name="login" method="post">

<% if (!StringUtils.isEmpty(request.getAttribute("page"))
&& !"/open.knowledge/list".equals(request.getAttribute("page"))) { %>
<div class="form-group">
<div class="">
<%= jspUtil.label("knowledge.auth.description") %>
</div>
</div>
<% } %>

<c:if test="${loginError}">
<div class="form-group">
<div class="">
<div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<%= jspUtil.label("message.login.error") %>
</div>
</div>
</div>
</c:if>

<div class="form-group">
<label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.id") %></label>
<div class="">
<input type="text" class="form-control"
name="username" value="<%= jspUtil.out("username") %>"
placeholder="<%= jspUtil.label("knowledge.auth.label.id") %>" autofocus>
</div>
</div>
<div class="form-group">
<label for="inputPass" class="control-label"><%= jspUtil.label("knowledge.auth.label.password") %></label>
<div class="">
<input type="password" class="form-control"
name="password" value="<%= jspUtil.out("password") %>"
placeholder="<%= jspUtil.label("knowledge.auth.label.password") %>">
</div>
</div>
<input type="hidden" name="page" value="<%= jspUtil.out("page") %>" id="page">

<a href="<%=request.getContextPath()%>/open.PasswordInitialization/view" class="text-primary">
<i class="fa fa-key"></i>&nbsp;<%= jspUtil.label("knowledge.auth.forgot.password") %>
</a>
<br/><br/>

<div class="form-group">
<div class="">
<button class="btn btn-primary " type="submit">
<i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signin") %>
</button>
<div class="container">
<form class=""
action="<%=request.getContextPath()%>/signin"
name="login" method="post">

<% if (!StringUtils.isEmpty(request.getAttribute("page"))
&& !"/open.knowledge/list".equals(request.getAttribute("page"))) { %>
<div class="form-group">
<div class="">
<%= jspUtil.label("knowledge.auth.description") %>
</div>
</div>
<% } %>

<c:if test="${loginError}">
<div class="form-group">
<div class="">
<div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<%= jspUtil.label("message.login.error") %>
</div>
</div>
</div>
</c:if>

<div class="form-group">
<label for="inputEmail" class="control-label"><%= jspUtil.label("knowledge.auth.label.id") %></label>
<div class="">
<input type="text" class="form-control"
name="username" value="<%= jspUtil.out("username") %>"
placeholder="<%= jspUtil.label("knowledge.auth.label.id") %>" autofocus>
</div>
</div>
<div class="form-group">
<label for="inputPass" class="control-label"><%= jspUtil.label("knowledge.auth.label.password") %></label>
<div class="">
<input type="password" class="form-control"
name="password" value="<%= jspUtil.out("password") %>"
placeholder="<%= jspUtil.label("knowledge.auth.label.password") %>">
</div>
</div>
<input type="hidden" name="page" value="<%= jspUtil.out("page") %>" id="page">

<div class="form-group">
<div class="">
<button class="btn btn-primary " type="submit">
<i class="fa fa-sign-in"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signin") %>
</button>
<% if (SystemConfigLogic.get().isUserAddAble()) { %>
<a href="<%= request.getContextPath() %>/open.signup/view" class="btn btn-info">
<i class="fa fa-plus-square"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signup") %>
</a>
<a href="<%= request.getContextPath() %>/open.signup/view" class="btn btn-info">
<i class="fa fa-plus-square"></i>&nbsp;<%= jspUtil.label("knowledge.auth.signup") %>
</a>
<% } %>

</div>
</div>


</form>
<br/><br/>
<a href="<%=request.getContextPath()%>/open.PasswordInitialization/view" class="text-primary">
<i class="fa fa-key"></i>&nbsp;<%= jspUtil.label("knowledge.auth.forgot.password") %>
</a>

</div>


</div>
</div>


</form>

</div>

</c:param>

</c:import>
Expand Down

0 comments on commit c5815ca

Please sign in to comment.