Loading... |
Reply to author |
Edit post |
Move post |
Delete this post |
Delete this post and replies |
Change post date |
Print post |
Permalink |
Raw mail |
14119 posts
|
Author: jleroux
Date: Fri Apr 20 06:12:25 2012 New Revision: 1328205 URL: http://svn.apache.org/viewvc?rev=1328205&view=rev Log: A patch from Tom Burns for "eCommerce Customer Code Cleanup" https://issues.apache.org/jira/browse/OFBIZ-4830 1. In OFBIZ-4822 it was decided that request to authview would be removed from the eCommerce customer ftl files because their only purpose was to set URL to https. The set field "donePage" in CustomerScreens.xml editperson effects the same result. 2. There are brackets in the password.ftl display for the href: <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> The brackets are inconsistent with the display for similar elements in the applications Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Fri Apr 20 06:12:25 2012 @@ -116,10 +116,10 @@ under the License. <security https="false" auth="false"/> <response name="success" type="view" value="main"/> </request-map> - <request-map uri="authview"> - <security https="true" auth="true"/> - <response name="success" type="view" value="main"/> - </request-map> +<!-- <request-map uri="authview"> --> +<!-- <security https="true" auth="true"/> --> +<!-- <response name="success" type="view" value="main"/> --> +<!-- </request-map> --> <request-map uri="main"><security https="false" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="policies"><security https="false" auth="false"/><response name="success" type="view" value="policies"/></request-map> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl Fri Apr 20 06:12:25 2012 @@ -18,8 +18,8 @@ under the License. --> <div class="screenlet"> <h2>${uiLabelMap.PartyChangePassword}</h2> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> - <a href="javascript:document.getElementById('changepasswordform').submit()" class="button">${uiLabelMap.CommonSave}</a> + <a id="CommonGoBack1" href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a id="CommonSave1" href="javascript:document.getElementById('changepasswordform').submit()" class="button">${uiLabelMap.CommonSave}</a> <p/> <div class="screenlet-body"> <form id="changepasswordform" method="post" action="<@ofbizUrl>updatePassword/${donePage}</@ofbizUrl>"> @@ -43,7 +43,7 @@ under the License. <label>${uiLabelMap.CommonFieldsMarkedAreRequired}</label> </fieldset> </form> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">[${uiLabelMap.CommonGoBack}]</a> <a href="javascript:document.getElementById('changepasswordform').submit()" class="button">[${uiLabelMap.CommonSave}]</a> </div> </div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Fri Apr 20 06:12:25 2012 @@ -19,7 +19,7 @@ under the License. <#if canNotView> <h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3> -<a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> +<a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> <#else> <#if !creditCard?exists> <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Fri Apr 20 06:12:25 2012 @@ -19,7 +19,7 @@ under the License. <#if canNotView> <p><h3>${uiLabelMap.AccountingEFTNotBelongToYou}.</h3></p> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <#else> <#if !eftAccount?exists> <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Fri Apr 20 06:12:25 2012 @@ -19,7 +19,7 @@ under the License. <#if canNotView> <p><h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3></p> - <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> <#else> <#if !giftCard?exists> <h1>${uiLabelMap.AccountingAddNewGiftCard}</h1> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl?rev=1328205&r1=1328204&r2=1328205&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Fri Apr 20 06:12:25 2012 @@ -24,7 +24,7 @@ under the License. <form id="editpersonform2" method="post" action="<@ofbizUrl>createPerson/${donePage}</@ofbizUrl>" name="editpersonform"> </#if> <div> - <a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> + <a href='<@ofbizUrl>${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> <a href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> <p/> <input type="hidden" name="partyId" value="${person.partyId?if_exists}" /> @@ -174,5 +174,5 @@ under the License. </table> </div> </form> - <a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> + <a href='<@ofbizUrl>${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> <a id="editpersonform3" href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> \ No newline at end of file |
Free forum by Nabble | Edit this page |