Skip to content

B
business-java
Commit 0f35f03f authored by spawar's avatar spawar
Browse files
Options

Added changes for change alignments 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105200 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c6c876ce
Hide whitespace changes
Inline Side-by-side
Showing with 466 additions and 20 deletions
webitm-wms/module-resource/web/css/resetPasswordCSS.css 0 → 100755
View file @ 0f35f03f
@font-face { /* declare fonts */
font-family: "MuseoLight" !important;
src: url("/ibase/E12Registration/fonts/Museo300-Regular.eot");
src: local("Museo 300"), local("Museo-300"),
url("/ibase/E12Registration/fonts/Museo300-Regular.woff") format("woff"),
url("/ibase/E12Registration/fonts/Museo300-Regular.otf") format("opentype"),
url("/ibase/E12Registration/fonts/Museo300-Regular.svg#Museo-300") format("svg");
}
html, body, .container
{
height: 100%;
min-height: 100%;
font-family:'MuseoLight', sans-serif;
}
td{
font-family:'MuseoLight', sans-serif !important;
}
/* body{ background: #f7f8fa; color:#838383;
font: 13px/1.7em 'Open Sans';
font-size: 13px;
line-height: 18px;
color: #333333;
} */
.container
{
margin: 150px auto 0 auto;
width: 380px;
height:280px;
display: block;
}
.account-container {
width: 380px;
height:330px;
display: block;
background: #fff;
border: 1px solid #d5d5d5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
box-shadow: 0px 0px 2px #dadada, inset 0px 1px 0px #0fdefd;
}
.container1 {
width: 380px;
display: block;
margin: 80px auto 0 auto;
}
.verificationContainer {
width: 380px;
display: block;
margin: 10px auto 0 auto;
}
.verificationMsg
{
width: 380px;
display: block;
margin: 80px auto 0 auto;
}
#msg
{
text-align:center;
color:#05A5E8;
-moz-animation: cssAnimation 0s ease-in 5s forwards;
/* Firefox */
-webkit-animation: cssAnimation 0s ease-in 5s forwards;
/* Safari and Chrome */
-o-animation: cssAnimation 0s ease-in 5s forwards;
/* Opera */
animation: cssAnimation 0s ease-in 5s forwards;
-webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
}
@keyframes cssAnimation {
to {
width:0;
height:0;
overflow:hidden;
}
}
@-webkit-keyframes cssAnimation {
to {
width:0;
height:0;
visibility:hidden;
}
}
.account-container1 {
width: 400px;
height:415px;
display: block;
background: #fff;
border: 1px solid #d5d5d5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
box-shadow: 0px 0px 2px #dadada, inset 0px 1px 0px #0fdefd;
}
.account-container2 {
width: 450px;
height:750px;
display: block;
margin: 10px auto 0 auto;
background: #fff;
border: 1px solid #d5d5d5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
box-shadow: 0px 0px 2px #dadada, inset 0px 1px 0px #0fdefd;
}
.content {
padding: 0px 28px 23px;
}
.field {
margin-bottom: 1.25em;
/*margin-top: 2.25em;*/
margin-top: 1.25em;/*Samadhan*/
}
.field-detail {
margin-bottom: 1.25em;
margin-top: 1.25em;
}
/*FORM*/
.gwtLabelflicker,
.gwtTextField,
.gwtTextAreaStyle
{
-webkit-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
-ms-transition: all 0.3s ease-in-out;
}
.gwtLabelflicker
{
/*padding-left: 15px;Comment by Samadhan*/
padding-bottom: 10px;
font-size: 14px;
color: #999;
display: block;
outline: none;
outline-color: transparent;
margin-top: -20px;
}
.gwtTextAreaStyle
{
max-height: 25px;
line-height: 20px;
background-image: -moz-linear-gradient(top , transparent, literal("transparent 21px"),literal("#E7EFF8 0px")) ;
background-image: -webkit-linear-gradient(top , transparent, literal("transparent 21px"),literal("#E7EFF8 0px"));
background: -o-linear-gradient(top, transparent, literal("transparent 21px"),literal("#E7EFF8 0px"));
background: -ms-linear-gradient(top, transparent, literal("transparent 21px"),literal("#E7EFF8 0px"));
background: linear-gradient(to bottom, transparent, literal("transparent 21px"),literal("#E7EFF8 0px"));
-webkit-background-size: 100% 22px;
background-size: 100% 22px;
padding:10px;
}
.dropDownflicker
{
padding-left: 15px;
padding-bottom: 10px;
font-size: 14px;
color: #999;
outline: none;
outline-color: transparent;
margin-top: -20px;
}
.gwtTextField,
.gwtTextAreaStyle
{
/*margin: 5px;
width: 224px;
display: block;
border: none;
padding: 5px;
font-size: 14px;
border-bottom: solid 1px rgba(221, 221, 221, 0.7);
background-repeat: no-repeat;
background: transparent;
outline: none;
-moz-outline: none;
padding-top: 15px;
margin-top: 10px;
outline-color: transparent;
box-sizing: border-box;
margin-bottom: 10px;*/
appearance: none;
border-bottom: 1px solid #ccc;
border-top:none;
border-left:none;
border-right:none;
line-height: 0;
font-size: 14px;
width: 90%;
display: block;
box-sizing: border-box;
padding: 10px 0px 5px 0;
color: #999;
position: relative;
z-index: 1;
background-color:transparent;
/* margin:0 15px; comment by Samadhan*/
}
.gwtTextField1,
.gwtTextAreaStyle
{
appearance: none;
border-bottom: 1px solid #ccc;
border-top:none;
border-left:none;
border-right:none;
line-height: 0;
font-size: 14px;
display: block;
box-sizing: border-box;
padding: 10px 0px 5px 0;
color: #999;
position: relative;
z-index: 1;
background-color:transparent;
margin:0 15px;
}
.gwtTextField:focus,
.gwtTextField:valid,
.gwtTextAreaStyle:focus,
.gwtTextAreaStyle:valid
{
outline: none;
color: black;
/* margin-top: -5px; */
/* padding-top: 5px; */
border-bottom: solid 1px #ccc;
}
.gwtTextAreaStyle:focus,
.gwtTextAreaStyle:valid
{
margin-top: -5px;
padding-top: 5px;
}
.gwtTextField:focus ~ .gwtLabelflicker,
.gwtTextField:valid ~ .gwtLabelflicker
{
outline: none;
color: #05a5e8;
transform: translateY(-20px);
-moz-transform: translateY(-20px);
-ms-transform: translateY(-20px);
-webkit-transform: translateY(-20px);
}
/*eND*/
.btn-success {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(126, 178, 22, 0)), color-stop(100%, rgba(0, 0, 0, 0.1)));
background-image: -webkit-linear-gradient(rgba(126, 178, 22, 0), rgba(0, 0, 0, 0.1));
background-image: -moz-linear-gradient(rgba(126, 178, 22, 0), rgba(0, 0, 0, 0.1));
background-image: -o-linear-gradient(rgba(126, 178, 22, 0), rgba(0, 0, 0, 0.1));
background-image: linear-gradient(rgba(126, 178, 22, 0), rgba(0, 0, 0, 0.1));
background-color: #7eb216;
border-color: #6e9b13 #6e9b13 #3e570b;
border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.15);
color: white;
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.15);
*background-color: #6e9b13;
padding:5px 15px;
border-radius:2px;
float:right;
margin-right:5px;
}
.login-extra {
display: block;
/* width: 300px; */
margin: 1.5em auto;
text-align: left;
line-height: 19px;
/* text-align:right; */
}
@media (max-width: 480px) {
.account-container {
width: 280px;
margin-top: 35px;
height:auto;
}
.gwtTextField {
width: 200px;
}
.content {
padding: 16px 20px;
}
h1
{
font-size:10px;;
}
.btn-success
{
padding:5px;
}
}
.tab-content
{
padding:0px 40px 0px 30px;
border-right:1px #d1d1d1 solid;
}
.noborder
{
border:none;
}
.pt0
{
padding-top:0;
}
.tab-content > .tab-pane,
.pill-content > .pill-pane {
display: none;
}
.tab-content > .active,
.pill-content > .active {
display: block;
}
.dropDown
{
color: #999;
margin:0 22px;
float: right;
width: 47%;
}
.heading_name
{
width: 100%;
background-color: gray;
color: white;
padding-top: 10px;
padding-bottom: 10px;
}
/* Added by samadhan */
.firstLogin
{
padding: 0px 10px 10px 0px;
}
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
input:-webkit-autofill:active {
transition: background-color 5000s ease-in-out 0s;
}
.field
{
position:relative;
}
.tooltip
{
/* margin-left:15px;*/
position:absolute;
}
.tooltip
{
display:none;
width: 220px;
background-color: #555;
color: #fff;
text-align: center;
border-radius: 6px;
padding: 5px 0;
position: absolute;
z-index: 1;
/* bottom: 90%;*/
/* left: 50%;
margin-left: -60px;*/
opacity: 1;
transition: opacity 1s;
}
.tooltip::before {
content: "";
position: absolute;
top: -10px;
left: 15%;
margin-left: -5px;
border-width: 5px;
border-style: solid;
border-color: transparent transparent #555 transparent;
}
webitm-wms/module-resource/web/js/resetPassword.js
View file @ 0f35f03f
......@@ -11,6 +11,24 @@ function validateEmailFrRegi(frm)
email.focus();
return false;
}*/
//Added by samadhan for check user code empty validation start
if(frm.userCode.value.length == 0)
{
isEmpty(frm.userCode.id);
return false;
}
if(frm.password.value.length == 0)
{
isEmpty(frm.password.id);
return false;
}
if(frm.confpwd.value.length == 0)
{
isEmpty(frm.confpwd.id);
return false;
}
//Added by samadhan for check user code empty validation end
var password = frm.password.value;
if(password != null || password != '' || password != 'undefined')
{
......@@ -91,14 +109,18 @@ function isEmpty(id)
var msgDiv =document.getElementById('msgDiv');
if(msgDiv==null)
{
$("#"+id).after("<div id='msgDiv' style='color:red' >Field can't be empty</div>");
//$("#"+id).after("<div id='msgDiv' style='color:red' >Field can't be empty</div>");
document.getElementById("tooltip_"+id).innerHTML = "Field can't be empty";
document.getElementById("tooltip_"+id).style.display = "block";
}
setTimeout(function() { $("#"+id).focus() }, 1);
}
else
{
$("#msgDiv").remove();
//$("#msgDiv").remove();
document.getElementById("tooltip_"+id).innerHTML = "";
document.getElementById("tooltip_"+id).style.display = "none";
}
if(idVal.length ==0 )
{
......@@ -107,6 +129,11 @@ function isEmpty(id)
}
function removeTooltip(id)
{
document.getElementById("tooltip_"+id).style.display = "none";
}
function setActionVal( value )
{
document.getElementById("action").value = value;
......
webitm-wms/module-resource/web/jsp/ResetPassword.jsp
View file @ 0f35f03f
......@@ -2,7 +2,7 @@
<jsp:useBean id="verificationBean" class="ibase.webitm.e12lite.bean.E12RegistrationBean"></jsp:useBean> --%>
<!DOCTYPE html>
<html lang="en">
<html>
<head>
<meta charset="utf-8">
......@@ -12,8 +12,10 @@
<script type="text/javascript" language="javascript" src="/ibase/webitm/js/resetPassword.js"></script>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/resetPasswordCSS.css">
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.6.1.min.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.8.13.custom.min.js"></script>
<%-- <script type="text/javascript" src="/ibase/webitm/js/jquery-1.6.1.min.js"></script> --%>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<%-- <script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.8.13.custom.min.js"></script> --%>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
</head>
<body>
......@@ -42,7 +44,7 @@
<div class="content clearfix">
<form action="/ibase/ResetPasswordServlet" method="post" id="loginFrm" onSubmit="return validateEmailFrRegi(this);">
<form novalidate="novalidate" action="/ibase/ResetPasswordServlet" method="post" id="loginFrm" onSubmit="return validateEmailFrRegi(this);">
<INPUT type="hidden" name="actionName" value="RESET_PASSWORD"/>
<INPUT TYPE="hidden" id="newPwdSHA256" name="newPwdSHA256">
......@@ -52,22 +54,25 @@
<div class="login-fields">
<div class="field">
<input type="text" class="gwtTextField" id="userCode" name="userCode" maxlength="40" onblur="isEmpty(this.id);" />
<label class="gwtLabelflicker">User Code</label>
</div> <!-- /field -->
<input type="text" class="gwtTextField" id="userCode" name="userCode" maxlength="40" required onkeydown="removeTooltip(this.id)" /> <%-- Samadhan removed onblur="isEmpty(this.id);" --%>
<label class="gwtLabelflicker">User Code</label>
<div class="tooltip" id="tooltip_userCode"></div>
</div> <!-- /field -->
<div class="field">
<input type="text" class="gwtTextField" id="password" name="password" maxlength="40" onblur="isEmpty(this.id);"/>
<label class="gwtLabelflicker">Password</label>
</div> <!-- /field -->
<div class="field">
<input type="password" class="gwtTextField" id="confpwd" name="confpwd" maxlength="40" onblur="isEmpty(this.id);"/>
<label class="gwtLabelflicker">Confirm password</label>
<input type="checkbox" id = "firstLogin" name="firstLogin" value = "Y" checked="checked"> Change password on first login.
</div> <!-- /field -->
<div class="field">
<input type="text" class="gwtTextField" id="password" name="password" maxlength="40" required onkeydown="removeTooltip(this.id)" /> <%-- Samadhan removed onblur="isEmpty(this.id);" --%>
<label class="gwtLabelflicker">Password</label>
<div class="tooltip" id="tooltip_password"></div>
</div> <!-- /field -->
<div class="field">
<input type="password" class="gwtTextField" id="confpwd" name="confpwd" maxlength="40" required onkeydown="removeTooltip(this.id)" /> <%-- Samadhan removed onblur="isEmpty(this.id);" --%>
<label class="gwtLabelflicker">Confirm password</label>
<div class="tooltip" id="tooltip_confpwd"></div>
</div> <!-- /field -->
<div class="firstLogin">
<input type="checkbox" id = "firstLogin" name="firstLogin" value = "Y" checked="checked"> Change password on first login.
</div>
</div> <!-- /login-fields -->
<div class="login-actions">
......
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