Menu
▾
▴
[Compiere-cvslog] CVS: webStore/src/web login.jsp,1.24,1.25 assets.jsp,1.13,1.14
|
From: Jorg J. <jj...@us...> - 2005-05-01 07:00:59
|
Update of /cvsroot/compiere/webStore/src/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12121/src/web Modified Files: login.jsp assets.jsp Log Message: Index: login.jsp =================================================================== RCS file: /cvsroot/compiere/webStore/src/web/login.jsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** login.jsp 9 Nov 2004 03:51:15 -0000 1.24 --- login.jsp 1 May 2005 07:00:51 -0000 1.25 *************** *** 36,40 **** <tr> <td align="right"><label id="ID_EMail" for="EMail"><cws:message txt="EMail"/></label></td> ! <td align="left"><input class="Cmandatory" size="40" id="ID_EMail" value='<c:out value="${webUser.email}"/>' name="EMail" maxlength="60" type="text"/> </td> </tr> --- 36,41 ---- <tr> <td align="right"><label id="ID_EMail" for="EMail"><cws:message txt="EMail"/></label></td> ! <td align="left"><input class="Cmandatory" size="40" id="ID_EMail" value='<c:out value="${webUser.email}"/>' name="EMail" maxlength="60" type="text"/> ! <input name="validated" type="checkbox" id="validated" value="validated" disabled <c:if test='${webUser.EMailVerified}'>checked</c:if>> Address validated </td> </tr> Index: assets.jsp =================================================================== RCS file: /cvsroot/compiere/webStore/src/web/assets.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** assets.jsp 26 Oct 2004 06:01:41 -0000 1.13 --- assets.jsp 1 May 2005 07:00:51 -0000 1.14 *************** *** 29,38 **** <p><b><c:out value='${info.message}'/></b></p> </c:if> <table width="100%" border="1" cellspacing="2" cellpadding="2"> <tr> <th>Name</th> <th>Description</th> ! <th>Guarantee Date</th> ! <th>Version, Serial</th> <th>Delivery</th> <th>Download</th> --- 29,58 ---- <p><b><c:out value='${info.message}'/></b></p> </c:if> + <c:if test='${not webUser.EMailVerified}'> + <form action="emailServlet" method="post" enctype="application/x-www-form-urlencoded" + name="EMailVerification" target="_top"> + <input name="AD_Client_ID" type="hidden" value='<c:out value="${initParam.#AD_Client_ID}" default="0"/>'/> + <input name="Source" type="hidden" value=""/> + <input name="Info" type="hidden" value=""/> + <script language="Javascript"> + document.EMailVerification.Source.value=document.referrer; + document.EMailVerification.Info.value=document.lastModified; + </script> + <p><b>To access your Assets:</b></p> + <p>Enter Verification Code + <input name="VerifyCode" type="text" id="VerifyCode" value="<Check EMail>"> + <input type="submit" name="Submit" value="Submit"> + </p> + <p>The Verification Code will be sent to <c:out value='${webUser.email}'/> + <input type="submit" name="ReSend" id="ReSend" value="Re-Send Verification Code"> + </p> + </form> + </c:if> <table width="100%" border="1" cellspacing="2" cellpadding="2"> <tr> <th>Name</th> <th>Description</th> ! <th>Guarantee Date, Qty </th> ! <th>Your Version, Serial</th> <th>Delivery</th> <th>Download</th> *************** *** 42,52 **** <td><c:out value='${asset.name}'/></td> <td><c:out value='${asset.description}'/> </td> ! <td><fmt:formatDate value='${asset.guaranteeDate}'/></td> ! <td><c:out value='${asset.versionNo}'/> <br><c:out value='${asset.serNo}'/> </td> ! <td><c:out value='${asset.downloadName}'/> </td> <td> <c:if test='${asset.downloadable}'> <a href="<c:out value='http://${ctx.context}/'/>assetServlet/<c:out value='${asset.downloadName}'/>.zip?Asset_ID=<c:out value='${asset.a_Asset_ID}'/>" target="_blank"> ! <img src="assetDownload.gif" alt="Download" width="24" height="24" border="0"></a> </c:if> <c:if test='${not asset.downloadable}'> --- 62,80 ---- <td><c:out value='${asset.name}'/></td> <td><c:out value='${asset.description}'/> </td> ! <td><fmt:formatDate value='${asset.guaranteeDate}'/><br><c:out value='${asset.qty}'/></td> ! <td><c:out value='${asset.versionNo}'/><br><c:out value='${asset.serNo}'/></td> ! <td><c:out value='${asset.downloadName}'/> ! <c:forEach items='${asset.addlDownloadNames}' var='addlDL'> ! <br><c:out value='${addlDL}'/> ! </c:forEach> ! </td> <td> <c:if test='${asset.downloadable}'> <a href="<c:out value='http://${ctx.context}/'/>assetServlet/<c:out value='${asset.downloadName}'/>.zip?Asset_ID=<c:out value='${asset.a_Asset_ID}'/>" target="_blank"> ! <img src="assetDownload.gif" alt="Download <c:out value='${asset.downloadName}'/>" width="24" height="24" border="0"></a> ! <c:forEach items='${asset.addlDownloadURLs}' var='addlDL'> ! <br><a href="<c:out value='http://${ctx.context}/'/>assetServlet/<c:out value='${addlDL}'/>.zip?Asset_ID=<c:out value='${asset.a_Asset_ID}'/>&PD=<c:out value='${addlDL}'/>" target="_blank"> ! <img src="assetDownload.gif" alt="Download <c:out value='${addlDL}'/>" width="24" height="24" border="0"></a> ! </c:forEach> </c:if> <c:if test='${not asset.downloadable}'> *************** *** 59,64 **** </table> <c:if test='${webUser.creditCritical}'> ! <p><c:out value='${webUser.SOCreditStatus}'/></p> ! </c:if> <p>To download, click on the link - or right-click and "Save Target As ..."</p> --- 87,92 ---- </table> <c:if test='${webUser.creditCritical}'> ! <p><strong><font color="#990000">! <c:out value='${webUser.SOCreditStatus}'/> !</font></strong></p> ! </c:if> <p>To download, click on the link - or right-click and "Save Target As ..."</p> |