Skip to content

P
PERFORMA_REPLICA
Commit 23fb5e89 by chenith Committed by Harsh Shah
Options

Merge conflicts.

parent 9fc73ea0
Showing with 3 additions and 6 deletions
cmsWebApp/webroot/extensions/adminportal/sign_in.jsp
......@@ -63,8 +63,6 @@
<oneit:form name="login" method="post">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="main-box-layout login-box">
<div class="form-group text-left">
<label>Email Address</label>
<input type="text" class="form-control" name="username" required>
......@@ -74,10 +72,10 @@
<input type="password" class="form-control" name="password" required>
</div>
<div class="form-group">
<oneit:button value="Forgot password?" name="gotoPage" cssClass="forgot-pass" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "forgot_password.jsp")
.toMap() %>"></oneit:button>
<oneit:button value="Forgot password?" name="gotoPage" cssClass="forgot-pass" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", "forgot_password.jsp")
.toMap() %>"></oneit:button>
<oneit:button value="Sign in" name="login" cssClass="box-btn login-btn"
requestAttribs="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
......@@ -108,7 +106,6 @@
</ul>
</oneit:form>
</div>
</oneit:form>
<footer class="power-footer">
<div class="footer-link text-center">
<ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment