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: Tue Apr 17 20:12:11 2012 New Revision: 1327269 URL: http://svn.apache.org/viewvc?rev=1327269&view=rev Log: A patch from Tom Burns for "eCommerce Profile Improve Button Naming Consistency" https://issues.apache.org/jira/browse/OFBIZ-4822 In eCommerce the naming and display of back buttons is inconsistent across the Profile Editing screens. Example: Changes Password label should be "Go Back" but is "[Go Back]" Modified: 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 ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl 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=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/changepassword.ftl Tue Apr 17 20:12:11 2012 @@ -17,9 +17,10 @@ specific language governing permissions 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> + <h2>${uiLabelMap.PartyChangePassword}</h2> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a 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>"> <fieldset> 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=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Tue Apr 17 20:12:11 2012 @@ -19,7 +19,7 @@ under the License. <#if canNotView> <h3>${uiLabelMap.AccountingCardInfoNotBelongToYou}.</h3> -<a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a> +<a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> <#else> <#if !creditCard?exists> <h2>${uiLabelMap.AccountingAddNewCreditCard}</h2> @@ -30,9 +30,10 @@ under the License. <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform"> <div> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> - </#if> - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> + </#if> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> + <p/> <table width="90%" border="0" cellpadding="2" cellspacing="0"> ${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")} <tr> @@ -134,9 +135,8 @@ under the License. </tr> </table> </div> - </form> - - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> + </form> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editcreditcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> </#if> 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=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Tue Apr 17 20:12:11 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.CommonBack}</a> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <#else> <#if !eftAccount?exists> <h1>${uiLabelMap.AccountingAddNewEftAccount}</h1> @@ -29,9 +29,9 @@ under the License. <form method="post" action="<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>" name="editeftaccountform" style="margin: 0;"> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editeftaccountform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> - + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a> + <p/> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td> @@ -177,8 +177,7 @@ under the License. </tr> </table> </form> - - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelDone}</a> - <a href="javascript:document.editeftaccountform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editeftaccountform.submit()" class="button">${uiLabelMap.CommonSave}</a> </#if> 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=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Tue Apr 17 20:12:11 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.CommonBack}]</a> + <a href="<@ofbizUrl>authview/${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a> <#else> <#if !giftCard?exists> <h1>${uiLabelMap.AccountingAddNewGiftCard}</h1> @@ -29,9 +29,9 @@ under the License. <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editgiftcardform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> - + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> + <p/> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> @@ -107,8 +107,7 @@ under the License. </td> </tr> </table> - </form> - - <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> - <a href="javascript:document.editgiftcardform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> + </form> + <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.editgiftcardform.submit()" class="button">${uiLabelMap.CommonSave}</a> </#if> 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=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Tue Apr 17 20:12:11 2012 @@ -18,15 +18,15 @@ under the License. --> <#if person?exists> <h2>${uiLabelMap.PartyEditPersonalInformation}</h2> - <form method="post" action="<@ofbizUrl>updatePerson/${donePage}</@ofbizUrl>" name="editpersonform"> + <form id="editpersonform1" method="post" action="<@ofbizUrl>updatePerson</@ofbizUrl>" name="editpersonform"> <#else> <h2>${uiLabelMap.PartyAddNewPersonalInformation}</h2> - <form method="post" action="<@ofbizUrl>createPerson/${donePage}</@ofbizUrl>" name="editpersonform"> + <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="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> - + <a href='<@ofbizUrl>authview/${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}" /> <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> @@ -174,6 +174,5 @@ under the License. </table> </div> </form> - -<a href='<@ofbizUrl>authview/${donePage}</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a> -<a href="javascript:document.editpersonform.submit()" class="button">${uiLabelMap.CommonSave}</a> + <a href='<@ofbizUrl>authview/${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 Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1327269&r1=1327268&r2=1327269&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Tue Apr 17 20:12:11 2012 @@ -93,6 +93,9 @@ will generally always be reserved for th </#if> </#macro> + <a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.getElementById('newuserform').submit()" class="button">${uiLabelMap.CommonSave}</a> + <form method="post" action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" id="newuserform"> @@ -396,9 +399,9 @@ and a tags acting as submit buttons, all class name of "button". No other class names should be used to style button actions. -------------------------------------------------------------------------------> -<div class="buttons"> - <a href="javascript:document.getElementById('newuserform').submit()">${uiLabelMap.CommonSave}</a> - <a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="reset">${uiLabelMap.CommonBack}</a> +<div class="buttons"> + <a href="<@ofbizUrl>checkLogin/main</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a> + <a href="javascript:document.getElementById('newuserform').submit()" class="button">${uiLabelMap.CommonSave}</a> </div> <script type="text/javascript"> |
Free forum by Nabble | Edit this page |