Skip to content

B
business-java
Commit efe7e38f authored by steurwadkar's avatar steurwadkar
Browse files
Options

Changes made for reset button on wizard screen 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105206 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0ba5bbff
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 12 deletions
webitm-wms/module-resource/web/css/WavegenWiz.css
View file @ efe7e38f
#mainPage-input-Container{ #mainPage-input-Container{
height : calc(100% - 150px); /* Changed by Santosh on 31/03/2017 */
/* height : calc(100% - 150px); */
height : calc(100% - 90px);
width : 95%; width : 95%;
border : 1px solid lightgray !important; border : 1px solid lightgray !important;
border-top: 2px solid #7bc6ff !important; border-top: 2px solid #7bc6ff !important;
...@@ -62,7 +64,9 @@ ...@@ -62,7 +64,9 @@
background-color: #fff; background-color: #fff;
margin:0px auto; margin:0px auto;
text-align: center; text-align: center;
z-index:2; /* Changed by Santosh on 31/03/2017 */
/* z-index:2; */
z-index:1005;
display:none; display:none;
position: fixed; position: fixed;
top: 200px; top: 200px;
...@@ -74,7 +78,9 @@ ...@@ -74,7 +78,9 @@
display: table-cell; display: table-cell;
} }
#detailPage-input-Container{ #detailPage-input-Container{
height : calc(100% - 150px); /* Changed by Santosh on 31/03/2017 */
/* height : calc(100% - 150px); */
height : calc(100% - 90px);
width : 98%; width : 98%;
border : 1px solid lightgray !important; border : 1px solid lightgray !important;
border-top: 2px solid #7bc6ff !important; border-top: 2px solid #7bc6ff !important;
...@@ -83,12 +89,15 @@ ...@@ -83,12 +89,15 @@
background-color: white; background-color: white;
} }
#summaryContainer{ #summaryContainer{
height : calc(100% - 150px); /* Changed by Santosh on 31/03/2017 */
/* height : calc(100% - 150px); */
height : calc(100% - 90px);
width : 98%; width : 98%;
border : 1px solid lightgray !important; border : 1px solid lightgray !important;
border-top: 2px solid #7bc6ff !important; border-top: 2px solid #7bc6ff !important;
padding: 10px; padding: 10px;
overflow:auto; /*Commented by Santosh on 31/03/17 to remove extra scroll bar*/
/* overflow:auto; */
background-color: white; background-color: white;
} }
#summaryContainer table tr:hover td{ #summaryContainer table tr:hover td{
...@@ -319,3 +328,16 @@ img.imagePanelSrc ...@@ -319,3 +328,16 @@ img.imagePanelSrc
text-align:center; text-align:center;
} }
/* Added by Santosh on 10/03/2017 End*/ /* Added by Santosh on 10/03/2017 End*/
div.panelSO::-webkit-scrollbar {
width: 6px;
height: 6px;
}
div.panelSO::-webkit-scrollbar-thumb {
background: #bbb;
}
div.panelSO::-webkit-scrollbar-thumb:window-inactive {
background: #bbb;
}
/* Added by Santosh on 31/03/2017 Start*/
/* Added by Santosh on 31/03/2017 End*/
\ No newline at end of file
webitm-wms/module-resource/web/js/WavegenWiz.js
View file @ efe7e38f
...@@ -1237,3 +1237,9 @@ function hideSortOrdDiv() ...@@ -1237,3 +1237,9 @@ function hideSortOrdDiv()
overlay.removeAttribute('style'); overlay.removeAttribute('style');
} }
//Added by Santosh on 10/03/2017 to generate sort_order seq [End] //Added by Santosh on 10/03/2017 to generate sort_order seq [End]
//Added by Santosh on 31/03/2017 for reset button Start
function setActionVal(action)
{
document.getElementById("action").value = action;
}
//Added by Santosh on 31/03/2017 for reset button End
\ No newline at end of file
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz1_wiz_en_US_A.xsl
View file @ efe7e38f
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
&#160;&#160;<img src="/ibase/images/menuImages/web/wavegeneration.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px; height: 20px; width: 20px;"/> &#160;&#160;<img src="/ibase/images/menuImages/web/wavegeneration.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px; height: 20px; width: 20px;"/>
&#160;Wave Generation &#160;Wave Generation
</div><br></br><br></br> </div><br></br><br></br>
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;"> <!-- Changed by Santosh on 31/03/2017 to remove horizontal scroll bar -->
<!-- <div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;"> -->
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:98%;position:absolute;">
<table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0"> <table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0">
<xsl:for-each select="//error"> <xsl:for-each select="//error">
<xsl:if test="position() = 1"> <xsl:if test="position() = 1">
...@@ -462,8 +464,10 @@ ...@@ -462,8 +464,10 @@
<div id="btnDiv"> <div id="btnDiv">
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" /> <input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="wavegen_wiz" name="OBJ_NAME" /> <input type="hidden" value="wavegen_wiz" name="OBJ_NAME" />
<input type="hidden" value="next" name="action" id="action" /> <input type="hidden" value="" name="action" id="action" />
<input type="submit" style="cursor:hand;margin-left:2px;" value="Next" onclick="return displayWaitImg();" class="button" title='Next' id="next"/> <!-- Added by Santosh on 31/03/2017 for Reset button -->
<input type="submit" style="cursor:hand;margin-left:2px;" value="Reset" onclick="setActionVal('reset');" class="button" title='Reset' id="reset"/>
<input type="submit" style="cursor:hand;margin-left:2px;" value="Next" onclick="setActionVal('next');return displayWaitImg();" class="button" title='Next' id="next"/>
</div> </div>
</div> </div>
<div id="buttonreplacement"> <div id="buttonreplacement">
......
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz2_wiz_en_US_A.xsl
View file @ efe7e38f
...@@ -106,8 +106,9 @@ ...@@ -106,8 +106,9 @@
<input type="button" Value="Expand All" class="button" id="accorAct" onclick="expandCollapse();" style="float: right;margin-right:2px;"/> <input type="button" Value="Expand All" class="button" id="accorAct" onclick="expandCollapse();" style="float: right;margin-right:2px;"/>
<input type="button" Value="Select All" class="button" id="selectAllRow" onclick="selectAllRows();" style="float: right;margin-right:2px;"/> <input type="button" Value="Select All" class="button" id="selectAllRow" onclick="selectAllRows();" style="float: right;margin-right:2px;"/>
</div><br/><br/> </div><br/><br/>
<!-- Changed by Santosh on 31/03/2017 to remove horizontal scroll bar -->
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;z-index:5;"> <!-- <div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;z-index:5;"> -->
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:98%;position:absolute;z-index:5;">
<table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0"> <table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0">
<xsl:for-each select="//error"> <xsl:for-each select="//error">
<xsl:if test="position() = 1"> <xsl:if test="position() = 1">
......
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz_SummaryPage_wiz_en_US_A.xsl
View file @ efe7e38f
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
&#160;&#160;<img src="/ibase/images/menuImages/web/wavegeneration.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px; height: 20px; width: 20px;"/> &#160;&#160;<img src="/ibase/images/menuImages/web/wavegeneration.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px; height: 20px; width: 20px;"/>
&#160;Wave Generation &#160;Wave Generation
</div><br></br><br></br> </div><br></br><br></br>
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;z-index:1002;"> <!-- Changed by Santosh on 31/03/2017 to remove horizontal scroll bar -->
<!-- <div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:100%;position:absolute;z-index:1002;"> -->
<div id="innerDiv" style="overflow-y:hidden;overflow-x:auto;max-height:80%;width:98%;position:absolute;z-index:1002;">
<table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0"> <table id="errorActivityTable" height="10%" class="tableClass" style="margin: 12px 0px 0px 0px;position: relative;width: calc(literal('100% - 15px'));width: -moz-calc(literal('100% - 15px'));padding-right:0px; padding-left:5xp; width: -webkit-calc(literal('100% - 15px'));box-shadow: 3px 3px 3px gray;-moz-box-shadow:3px 3px 3px gray;-webkit-box-shadow: 3px 3px 3px gray;-o-box-shadow: 3px 3px 3px gray;background: rgba(255, 204, 0, 0.66);min-height: 50px;bottom:10px" border="0" cellspacing="0" cellpadding="0">
<xsl:for-each select="//error"> <xsl:for-each select="//error">
<xsl:if test="position() = 1"> <xsl:if test="position() = 1">
......
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