svn commit: r946321 - in /ofbiz/branches/release10.04: ./ applications/party/webapp/part
Locked
 
|
Author: erwan
Date: Wed May 19 18:10:22 2010 New Revision: 946321 URL: http://svn.apache.org/viewvc?rev=946321&view=rev Log: Applied fix from trunk for revision: 946320 XHTML validation errors round 2++ (party) OFBIZ-3752 https://issues.apache.org/jira/browse/OFBIZ-3752 Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/addressMatchMap.ftl ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcreditcard.ftl ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editeftaccount.ftl ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editgiftcard.ftl Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 18:10:22 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320 Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/addressMatchMap.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/addressMatchMap.ftl?rev=946321&r1=946320&r2=946321&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original) +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/addressMatchMap.ftl Wed May 19 18:10:22 2010 @@ -26,8 +26,8 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> + <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>"> <table class="basic-table" cellspacing="0"> - <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>"> <tr> <td class="label">${uiLabelMap.PartyAddressMatchKey}</td> <td><input type="text" name="mapKey"/></td> @@ -44,18 +44,20 @@ under the License. <td></td> <td><a href="javascript:document.addaddrmap.submit()" class="smallSubmit">${uiLabelMap.CommonCreate}</a></td> </tr> - </form> + </table> + </form> + <table class="basic-table" cellspacing="0"> <tr><td colspan="2"> </td></tr> - <form name="importaddrmap"method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>"> <tr> <td></td> <td> + <form name="importaddrmap" method="post" enctype="multipart/form-data" action="<@ofbizUrl>importAddressMatchMapCsv</@ofbizUrl>"> <input type="file" name="uploadedFile" size="14"/> <input type="submit" value="${uiLabelMap.CommonUpload} CSV"/> <p>${uiLabelMap.PartyAddressMatchMessage1}</p> + </form> </td> </tr> - </form> </table> </div> </div> Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=946321&r1=946320&r2=946321&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcontactmech.ftl (original) +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcontactmech.ftl Wed May 19 18:10:22 2010 @@ -26,7 +26,7 @@ under the License. <tr> <td class="label">${uiLabelMap.PartySelectContactType}</td> <td> - <select name="preContactMechTypeId""> + <select name="preContactMechTypeId"> <#list mechMap.contactMechTypes as contactMechType> <option value="${contactMechType.contactMechTypeId}">${contactMechType.get("description",locale)}</option> </#list> Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=946321&r1=946320&r2=946321&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcreditcard.ftl (original) +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editcreditcard.ftl Wed May 19 18:10:22 2010 @@ -22,11 +22,8 @@ under the License. <div class="screenlet-title-bar"> <#if !creditCard?exists> <h3>${uiLabelMap.AccountingAddNewCreditCard}</h3> - <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> <#else> <h3>${uiLabelMap.AccountingEditCreditCard}</h3> - <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> - <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> </div> <div class="screenlet-body"> @@ -34,6 +31,12 @@ under the License. <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> <a href="javascript:document.editcreditcardform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> </div> + <#if !creditCard?exists> + <form method="post" action="<@ofbizUrl>createCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> + <#else> + <form method="post" action="<@ofbizUrl>updateCreditCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editcreditcardform" style="margin: 0;"> + <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> + </#if> <input type="hidden" name="partyId" value="${partyId}"/> <table class="basic-table" cellspacing="0"> Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=946321&r1=946320&r2=946321&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editeftaccount.ftl (original) +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editeftaccount.ftl Wed May 19 18:10:22 2010 @@ -22,11 +22,8 @@ under the License. <div class="screenlet-title-bar"> <#if !eftAccount?exists> <h3>${uiLabelMap.AccountingAddNewEftAccount}</h3> - <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> <#else> <h3>${uiLabelMap.PageTitleEditEftAccount}</h3> - <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> - <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' /> </#if> </div> <div class="screenlet-body"> @@ -34,6 +31,12 @@ under the License. <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> <a href="javascript:document.editeftaccountform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> </div> + <#if !eftAccount?exists> + <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> + <#else> + <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'> + <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' /> + </#if> <input type="hidden" name="partyId" value="${partyId}"/> <table class="basic-table" cellspacing="0"> <tr> Modified: ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editgiftcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=946321&r1=946320&r2=946321&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editgiftcard.ftl (original) +++ ofbiz/branches/release10.04/applications/party/webapp/partymgr/party/editgiftcard.ftl Wed May 19 18:10:22 2010 @@ -22,14 +22,17 @@ under the License. <div class="screenlet-title-bar"> <#if !giftCard?exists> <h3>${uiLabelMap.AccountingCreateNewGiftCard}</h3> - <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> <#else> <h3>${uiLabelMap.AccountingEditGiftCard}</h3> - <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> - <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> </div> <div class="screenlet-body"> + <#if !giftCard?exists> + <form method="post" action="<@ofbizUrl>createGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> + <#else> + <form method="post" action="<@ofbizUrl>updateGiftCard?DONE_PAGE=${donePage}</@ofbizUrl>" name="editgiftcardform" style="margin: 0;"> + <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> + </#if> <input type="hidden" name="partyId" value="${partyId}"/> <div class="button-bar"> <a href="<@ofbizUrl>${donePage}?partyId=${partyId}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonCancelDone}</a> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |