svn commit: r929303 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: buscob
Date: Tue Mar 30 21:30:33 2010 New Revision: 929303 URL: http://svn.apache.org/viewvc?rev=929303&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3608 - XHTML validation errors (party) XHTML validation errors * Unclosed INPUT * attributes without values (checked, selected, disabled, etc) * attribute values without " * Uppercase tags or attributes. * Unencoded ampersands in urls. Other errors: findparty.ftl Wrong markup at line 44,46. Entity without final ; > < Wrong markup at line 353. DIV tag with duplicated id. <div id="findPartyResults"> EditShopingList.ftl Wrong markup at line 28, duplicated " <a href="javascript:$('createEmptyShoppingList').submit();"" class="buttontext"> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Tue Mar 30 21:30:33 2010 @@ -83,7 +83,7 @@ under the License. <td>=></td> <td>${map.mapValue}</td> <td>${map.sequenceNum?if_exists}</td> - <td class="button-col"><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>">${uiLabelMap.CommonDelete}</a></td> + <td class="button-col"><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>">${uiLabelMap.CommonDelete}</a></td> </tr> <#-- toggle the row color --> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Tue Mar 30 21:30:33 2010 @@ -25,7 +25,7 @@ under the License. <li> <form id="createEmptyShoppingList" action="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>" method="post"> <input type="hidden" name="partyId" value="${partyId?if_exists}" /> - <a href="javascript:$('createEmptyShoppingList').submit();"" class="buttontext">${uiLabelMap.CommonCreateNew}</a> + <a href="javascript:$('createEmptyShoppingList').submit();" class="buttontext">${uiLabelMap.CommonCreateNew}</a> </form> </li> </ul> @@ -57,7 +57,7 @@ under the License. <ul> <li class="h3">${uiLabelMap.PartyShoppingListDetail} - ${shoppingList.listName}</li> <li><a href="javascript:document.updateList.submit();">${uiLabelMap.CommonSave}</a></li> - <li><a href="/ordermgr/control/createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}&applyStorePromotions=N">${uiLabelMap.PartyCreateNewQuote}</a></li> + <li><a href="/ordermgr/control/createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}&applyStorePromotions=N">${uiLabelMap.PartyCreateNewQuote}</a></li> <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.PartyCreateNewCustRequest}</a></li> <li><a href="/ordermgr/control/loadCartFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.OrderNewOrder}</a></li> </ul> @@ -65,16 +65,16 @@ under the License. </div> <div class="screenlet-body"> <form name="updateList" method="post" action="<@ofbizUrl>updateShoppingList</@ofbizUrl>"> - <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"> - <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}"> + <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}" /> + <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}" /> <table class="basic-table" cellspacing='0'> <tr> <td class="label">${uiLabelMap.PartyListName}</td> - <td><input type="text" size="25" name="listName" value="${shoppingList.listName}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + <td><input type="text" size="25" name="listName" value="${shoppingList.listName}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> /> </tr> <tr> <td class="label">${uiLabelMap.CommonDescription}</td> - <td><input type="text" size="70" name="description" value="${shoppingList.description?if_exists}" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>> + <td><input type="text" size="70" name="description" value="${shoppingList.description?if_exists}" <#if shoppingList.listName?default("") == "auto-save">disabled="disabled"</#if> /> </tr> <tr> <td class="label">${uiLabelMap.PartyListType}</td> @@ -134,7 +134,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${uiLabelMap.PartyChildShoppingList} - ${shoppingList.listName}</li> - <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>">${uiLabelMap.PartyAddChildListsToCart}</a></li> + <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>">${uiLabelMap.PartyAddChildListsToCart}</a></li> </ul> <br class="clear"/> </div> @@ -188,27 +188,27 @@ under the License. <#assign productVariantAssocs = shoppingListItemData.productVariantAssocs?if_exists> <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} - + <td><a href="/catalog/control/EditProduct?productId=${shoppingListItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${shoppingListItem.productId} - ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} </td> <form method="post" action="<@ofbizUrl>updateShoppingListItem</@ofbizUrl>" name='listform_${shoppingListItem.shoppingListItemSeqId}'> - <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"> - <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"> + <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}" /> + <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}" /> <td> - <input size="6" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"> + <input size="6" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}" /> </td> <td> <input size="6" type="text" name="quantityPurchased" <#if shoppingListItem.quantityPurchased?has_content> value="${shoppingListItem.quantityPurchased?if_exists?string.number}" - </#if>> + </#if> /> </td> </form> <td class="align-float"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></td> <td class="align-float"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></td> <td class="button-col align-float"> <a href="javascript:document.listform_${shoppingListItem.shoppingListItemSeqId}.submit();">${uiLabelMap.CommonUpdate}</a> - <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> + <a href="<@ofbizUrl>removeFromShoppingList?shoppingListId=${shoppingListItem.shoppingListId}&shoppingListItemSeqId=${shoppingListItem.shoppingListItemSeqId}</@ofbizUrl>">${uiLabelMap.CommonRemove}</a> </td> </tr> <#-- toggle the row color --> @@ -231,11 +231,11 @@ under the License. </div> <div class="screenlet-body"> <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"> - <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}"> - <input type="text" name="productId" value=""> - <input type="text" size="5" name="quantity" value="${requestParameters.quantity?default("1")}"> - <input type="submit" value="${uiLabelMap.PartyAddToShoppingList}"> + <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}" /> + <input type="hidden" name="partyId" value="${shoppingList.partyId?if_exists}" /> + <input type="text" name="productId" value="" /> + <input type="text" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /> + <input type="submit" value="${uiLabelMap.PartyAddToShoppingList}" /> </form> </div> </div> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Tue Mar 30 21:30:33 2010 @@ -21,7 +21,7 @@ under the License. <#if !preContactMechTypeId?has_content> <h1>${uiLabelMap.PartyCreateNewContact}</h1> <form method="post" action="<@ofbizUrl>editcontactmech</@ofbizUrl>" name="createcontactmechform"> - <input type="hidden" name="partyId" value="${partyId}"> + <input type="hidden" name="partyId" value="${partyId}" /> <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.PartySelectContactType}</td> @@ -47,13 +47,13 @@ under the License. </#if> <table class="basic-table" cellspacing="0"> <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> - <input type="hidden" name="DONE_PAGE" value="${donePage}"> - <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}"> - <input type="hidden" name="partyId" value="${partyId}"> - <#if cmNewPurposeTypeId?has_content><input type="hidden" name="contactMechPurposeTypeId" value="${cmNewPurposeTypeId}"></#if> - <#if preContactMechTypeId?exists><input type="hidden" name="preContactMechTypeId" value="${preContactMechTypeId}"></#if> - <#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}"></#if> - <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}'></#if> + <input type="hidden" name="DONE_PAGE" value="${donePage}" /> + <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}" /> + <input type="hidden" name="partyId" value="${partyId}" /> + <#if cmNewPurposeTypeId?has_content><input type="hidden" name="contactMechPurposeTypeId" value="${cmNewPurposeTypeId}" /></#if> + <#if preContactMechTypeId?exists><input type="hidden" name="preContactMechTypeId" value="${preContactMechTypeId}" /></#if> + <#if contactMechPurposeTypeId?exists><input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurposeTypeId?if_exists}" /></#if> + <#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if> <#else> <h1>${uiLabelMap.PartyEditContactInformation}</h1> <div id="mech-purpose-types"> @@ -92,10 +92,10 @@ under the License. </#if> <tr> <form method="post" action="<@ofbizUrl>createPartyContactMechPurpose</@ofbizUrl>" name="newpurposeform"> - <input type="hidden" name="partyId" value="${partyId}"> - <input type="hidden" name="DONE_PAGE" value="${donePage}"> - <input type="hidden" name="useValues" value="true"> - <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}"> + <input type="hidden" name="partyId" value="${partyId}" /> + <input type="hidden" name="DONE_PAGE" value="${donePage}" /> + <input type="hidden" name="useValues" value="true" /> + <input type="hidden" name="contactMechId" value="${contactMechId?if_exists}" /> <td class="button-col"> <select name="contactMechPurposeTypeId"> <option></option> @@ -111,40 +111,40 @@ under the License. </tr> </#if> <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform"> - <input type="hidden" name="contactMechId" value="${contactMechId}"> - <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}"> - <input type="hidden" name="partyId" value="${partyId}"> - <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}"> + <input type="hidden" name="contactMechId" value="${contactMechId}" /> + <input type="hidden" name="contactMechTypeId" value="${mechMap.contactMechTypeId}" /> + <input type="hidden" name="partyId" value="${partyId}" /> + <input type="hidden" name="DONE_PAGE" value="${donePage?if_exists}" /> </#if> <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists> <tr> <td class="label">${uiLabelMap.PartyToName}</td> <td> - <input type="text" size="50" maxlength="100" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}"> + <input type="text" size="50" maxlength="100" name="toName" value="${(mechMap.postalAddress.toName)?default(request.getParameter('toName')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAttentionName}</td> <td> - <input type="text" size="50" maxlength="100" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}"> + <input type="text" size="50" maxlength="100" name="attnName" value="${(mechMap.postalAddress.attnName)?default(request.getParameter('attnName')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine1}</td> <td> - <input type="text" size="100" maxlength="255" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}"> + <input type="text" size="100" maxlength="255" name="address1" value="${(mechMap.postalAddress.address1)?default(request.getParameter('address1')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyAddressLine2}</td> <td> - <input type="text" size="100" maxlength="255" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}"> + <input type="text" size="100" maxlength="255" name="address2" value="${(mechMap.postalAddress.address2)?default(request.getParameter('address2')?if_exists)}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.PartyCity}</td> <td> - <input type="text" size="50" maxlength="100" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}"> + <input type="text" size="50" maxlength="100" name="city" value="${(mechMap.postalAddress.city)?default(request.getParameter('city')?if_exists)}" /> </td> </tr> <tr> @@ -160,7 +160,7 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyZipCode}</td> <td> - <input type="text" size="30" maxlength="60" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}"> + <input type="text" size="30" maxlength="60" name="postalCode" value="${(mechMap.postalAddress.postalCode)?default(request.getParameter('postalCode')?if_exists)}" /> </td> </tr> <tr> @@ -193,10 +193,10 @@ under the License. <tr> <td class="label">${uiLabelMap.PartyPhoneNumber}</td> <td> - <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}"> - - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}"> - - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}"> - ${uiLabelMap.PartyContactExt} <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')?if_exists)}"> + <input type="text" size="4" maxlength="10" name="countryCode" value="${(mechMap.telecomNumber.countryCode)?default(request.getParameter('countryCode')?if_exists)}" /> + - <input type="text" size="4" maxlength="10" name="areaCode" value="${(mechMap.telecomNumber.areaCode)?default(request.getParameter('areaCode')?if_exists)}" /> + - <input type="text" size="15" maxlength="15" name="contactNumber" value="${(mechMap.telecomNumber.contactNumber)?default(request.getParameter('contactNumber')?if_exists)}" /> + ${uiLabelMap.PartyContactExt} <input type="text" size="6" maxlength="10" name="extension" value="${(mechMap.partyContactMech.extension)?default(request.getParameter('extension')?if_exists)}" /> </td> </tr> <tr> @@ -207,14 +207,14 @@ under the License. <tr> <td class="label">${mechMap.contactMechType.get("description",locale)}</td> <td> - <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}"> + <input type="text" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}" /> </td> </tr> <#else> <tr> <td class="label">${mechMap.contactMechType.get("description",locale)}</td> <td> - <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}"> + <input type="text" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}" /> </td> </tr> </#if> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Tue Mar 30 21:30:33 2010 @@ -26,7 +26,7 @@ under the License. <#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}"> + <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> </div> <div class="screenlet-body"> @@ -52,7 +52,7 @@ under the License. <#assign hasCurrent = true> <tr> <td class="button-col"> - <input type="radio" name="contactMechId" value="${curContactMechId}" checked> + <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" /> </td> <td> <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p> @@ -96,7 +96,7 @@ under the License. <#assign partyContactMech = postalAddressInfo.partyContactMech> <tr> <td class="button-col"> - <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"> + <input type="radio" name="contactMechId" value="${contactMech.contactMechId}" /> </td> <td> <#list partyContactMechPurposes as partyContactMechPurpose> @@ -123,7 +123,7 @@ under the License. <#-- not yet supported in party manager <tr> <td align="right" valigh="top" width="1%"> - <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked</#if>> + <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if> /> </td> <td valign="middle" width="80%"> ${uiLabelMap.PartyCreateNewBillingAddress}. Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Tue Mar 30 21:30:33 2010 @@ -26,7 +26,7 @@ under the License. <#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}'> + <input type="hidden" name='paymentMethodId' value='${paymentMethodId}' /> </#if> </div> <div class="screenlet-body"> @@ -39,27 +39,27 @@ under the License. <tr> <td class="label">${uiLabelMap.AccountingNameAccount}</td> <td> - <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}"> + <input type="text" class='required' size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> <tr> <td class="label">${uiLabelMap.AccountingCompanyNameAccount}</td> <td> - <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}"> + <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.AccountingBankName}</td> <td> - <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}"> + <input type="text" class='required' size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> <tr> <td class="label">${uiLabelMap.AccountingRoutingNumber}</td> <td> - <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}"> + <input type="text" class='required' size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -78,14 +78,14 @@ under the License. <tr> <td class="label">${uiLabelMap.AccountingAccountNumber}</td> <td> - <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}"> + <input type="text" class='required' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> <tr> <td class="label">${uiLabelMap.CommonDescription}</td> <td> - <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <input type="text" class='required' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> <span class="tooltip">${uiLabelMap.CommonRequired}</span> </td> </tr> @@ -100,7 +100,7 @@ under the License. <#if curPostalAddress?exists> <tr> <td class="button-col"> - <input type="radio" name="contactMechId" value="${curContactMechId}" checked> + <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" /> </td> <td> <p><b>${uiLabelMap.PartyUseCurrentAddress}:</b></p> @@ -142,7 +142,7 @@ under the License. <#assign partyContactMech = postalAddressInfo.partyContactMech> <tr> <td class="button-col"> - <input type='radio' name='contactMechId' value='${contactMech.contactMechId}'> + <input type='radio' name='contactMechId' value='${contactMech.contactMechId}' /> </td> <td> <#list partyContactMechPurposes as partyContactMechPurpose> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Tue Mar 30 21:30:33 2010 @@ -26,7 +26,7 @@ under the License. <#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}"> + <input type="hidden" name="paymentMethodId" value="${paymentMethodId}" /> </#if> </div> <div class="screenlet-body"> @@ -39,13 +39,13 @@ under the License. <tr> <td class="label">${uiLabelMap.AccountingCardNumber}</td> <td> - <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}"> + <input type="text" size="20" maxlength="60" name="cardNumber" value="${giftCardData.cardNumber?if_exists}" /> </td> </tr> <tr> <td class="label">${uiLabelMap.AccountingPinNumber}</td> <td> - <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}"> + <input type="text" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" /> </td> </tr> <tr> @@ -87,7 +87,7 @@ under the License. <tr> <td class="label">${uiLabelMap.CommonDescription}</td> <td> - <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <input type="text" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> </td> </tr> </table> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl Tue Mar 30 21:30:33 2010 @@ -67,7 +67,7 @@ under the License. </tr> <tr> <td></td> - <td><input type="submit" value="${uiLabelMap.PageTitleFindMatches}"></td> + <td><input type="submit" value="${uiLabelMap.PageTitleFindMatches}" /></td> </tr> </form> <#if match?has_content> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue Mar 30 21:30:33 2010 @@ -29,9 +29,9 @@ under the License. </#if> <h1>${uiLabelMap.PartyFindParties}</h1> <#if (parameters.firstName?has_content || parameters.lastName?has_content)> - <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/> + <#assign createUrl = "editperson?create_new=Y&lastName=${parameters.lastName?if_exists}&firstName=${parameters.firstName?if_exists}"/> <#elseif (parameters.groupName?has_content)> - <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/> + <#assign createUrl = "editpartygroup?create_new=Y&groupName=${parameters.groupName?if_exists}"/> <#else> <#assign createUrl = "createnew"/> </#if> @@ -41,9 +41,9 @@ under the License. <#if partyList?has_content> <ul> <#if hideFields == "Y"> - <li class="collapsed"><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}"> </a></li> + <li class="collapsed"><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}"> </a></li> <#else> - <li class="expanded"><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonHideFields}"> </a></li> + <li class="expanded"><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonHideFields}"> </a></li> </#if> <#if (partyListSize > 0)> <#if (partyListSize > highIndex)> @@ -202,7 +202,7 @@ under the License. <tr> <td> </td> <td> - <input type="submit" value="${uiLabelMap.CommonFind}" onClick="javascript:document.lookupparty.submit();"/> + <input type="submit" value="${uiLabelMap.CommonFind}" onclick="javascript:document.lookupparty.submit();"/> </td> </tr> </table> @@ -329,11 +329,11 @@ under the License. <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)> <form name= "searchorders_o_${rowCount}" method= "post" action= "/ordermgr/control/searchorders"> - <input type= "hidden" name= "lookupFlag" value= "Y"> - <input type= "hidden" name= "hideFields" value= "Y"> - <input type= "hidden" name= "partyId" value= "${partyRow.partyId}"> - <input type= "hidden" name= "viewIndex" value= "1"> - <input type= "hidden" name= "viewSize" value= "20"> + <input type= "hidden" name= "lookupFlag" value= "Y" /> + <input type= "hidden" name= "hideFields" value= "Y" /> + <input type= "hidden" name= "partyId" value= "${partyRow.partyId}" /> + <input type= "hidden" name= "viewIndex" value= "1" /> + <input type= "hidden" name= "viewSize" value= "20" /> <a href="javascript:document.searchorders_o_${rowCount}.submit()">${uiLabelMap.OrderOrders}</a> </form> <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a> @@ -350,7 +350,7 @@ under the License. </#list> </table> <#else> - <div id="findPartyResults"> + <div id="findPartyResults_2"> <h3>${uiLabelMap.PartyNoPartiesFound}</h3> </div> </#if> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Cart.ftl Tue Mar 30 21:30:33 2010 @@ -24,7 +24,7 @@ under the License. <li class="h3">${uiLabelMap.PartyCurrentShoppingCart}</li> <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> <#if savedCartListId?has_content> - <#assign listParam = "&shoppingListId=" + savedCartListId> + <#assign listParam = "&shoppingListId=" + savedCartListId> <#else> <#assign listParam = ""> </#if> @@ -45,7 +45,7 @@ under the License. <#list savedCartItems as savedCartItem> <tr> <td>${savedCartItem.shoppingListItemSeqId?if_exists}</td> - <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId?if_exists}</a></td> + <td class="button-col"><a href="/catalog/control/EditProduct?productId=${savedCartItem.productId}&externalLoginKey=${requestAttributes.externalLoginKey}">${savedCartItem.productId?if_exists}</a></td> <td>${savedCartItem.quantity?if_exists}</td> <td>${savedCartItem.quantityPurchased?if_exists}</td> </tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Tue Mar 30 21:30:33 2010 @@ -104,7 +104,7 @@ under the License. <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> <div> ${contactMech.infoString?if_exists} - <form method="post" action="<@ofbizUrl>NewDraftCommunicationEvent</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="createEmail${contactMech.infoString?replace("@","")?replace(".","")}"> + <form method="post" action="<@ofbizUrl>NewDraftCommunicationEvent</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createEmail${contactMech.infoString?replace("@","")?replace(".","")}"> <#if userLogin.partyId?has_content> <input name="partyIdFrom" value="${userLogin.partyId}" type="hidden"/> </#if> @@ -129,7 +129,7 @@ under the License. <#if partyContactMech.thruDate?has_content><div><b>${uiLabelMap.PartyContactEffectiveThru}: ${partyContactMech.thruDate}</b></div></#if> <#-- create cust request --> <#if custRequestTypes?exists> - <form name="createCustRequestForm" action="<@ofbizUrl>createCustRequest</@ofbizUrl>" method="post" onSubmit="javascript:submitFormDisableSubmits(this)"> + <form name="createCustRequestForm" action="<@ofbizUrl>createCustRequest</@ofbizUrl>" method="post" onsubmit="javascript:submitFormDisableSubmits(this)"> <input type="hidden" name="partyId" value="${partyId}"/> <input type="hidden" name="fromPartyId" value="${partyId}"/> <input type="hidden" name="fulfillContactMechId" value="${contactMech.contactMechId}"/> @@ -145,10 +145,10 @@ under the License. <td valign="top"><b>(${partyContactMech.allowSolicitation?if_exists})</b></td> <td class="button-col"> <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session) || userLogin.partyId == partyId> - <a href="<@ofbizUrl>editcontactmech?partyId=${partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editcontactmech?partyId=${partyId}&contactMechId=${contactMech.contactMechId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#if security.hasEntityPermission("PARTYMGR", "_DELETE", session) || userLogin.partyId == partyId> - <form name="partyDeleteContact" method="post" action="<@ofbizUrl>deleteContactMech</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)"> + <form name="partyDeleteContact" method="post" action="<@ofbizUrl>deleteContactMech</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)"> <input name="partyId" value="${partyId}" type="hidden"/> <input name="contactMechId" value="${contactMech.contactMechId}" type="hidden"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonExpire}"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl Tue Mar 30 21:30:33 2010 @@ -27,7 +27,7 @@ under the License. <#assign status = content.getRelatedOneCache("StatusItem")?if_exists> <#assign pcType = pContent.getRelatedOne("PartyContentType")> <tr> - <td class="button-col"><a href="<@ofbizUrl>EditPartyContents?contentId=${pContent.contentId}&partyId=${pContent.partyId}&partyContentTypeId=${pContent.partyContentTypeId}&fromDate=${pContent.fromDate}</@ofbizUrl>">${content.contentId}</a></td> + <td class="button-col"><a href="<@ofbizUrl>EditPartyContents?contentId=${pContent.contentId}&partyId=${pContent.partyId}&partyContentTypeId=${pContent.partyContentTypeId}&fromDate=${pContent.fromDate}</@ofbizUrl>">${content.contentId}</a></td> <td>${pcType.description?if_exists}</td> <td>${content.contentName?if_exists}</td> <td>${(contentType.get("description",locale))?if_exists}</td> @@ -39,10 +39,10 @@ under the License. <a href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>">${uiLabelMap.CommonView}</a> </#if> <form name="removePartyContent_${pContent_index}" method="post" action="<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>"> - <input type="hidden" name="contentId" value="${pContent.contentId}"> - <input type="hidden" name="partyId" value="${pContent.partyId}"> - <input type="hidden" name="partyContentTypeId" value= ${pContent.partyContentTypeId}"> - <input type="hidden" name="fromDate" value="${pContent.fromDate}"> + <input type="hidden" name="contentId" value="${pContent.contentId}" /> + <input type="hidden" name="partyId" value="${pContent.partyId}" /> + <input type="hidden" name="partyContentTypeId" value= ${pContent.partyContentTypeId}" /> + <input type="hidden" name="fromDate" value="${pContent.fromDate}" /> <a href="javascript:document.removePartyContent_${pContent_index}.submit()">${uiLabelMap.CommonRemove}</a> </form> </td> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Tue Mar 30 21:30:33 2010 @@ -59,9 +59,9 @@ under the License. </td> <td> <#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if> - <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> + <#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if> ${creditCard.firstNameOnCard} - <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> + <#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if> ${creditCard.lastNameOnCard} <#if creditCard.suffixOnCard?has_content> ${creditCard.suffixOnCard}</#if> - @@ -82,7 +82,7 @@ under the License. <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a> </#if> <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - <a href="<@ofbizUrl>editcreditcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editcreditcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> <#elseif "GIFT_CARD" == paymentMethod.paymentMethodTypeId> @@ -104,7 +104,7 @@ under the License. </td> <td class="button-col"> <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - <a href="<@ofbizUrl>editgiftcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editgiftcard?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> <#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId> @@ -120,7 +120,7 @@ under the License. </td> <td class="button-col"> <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session)> - <a href="<@ofbizUrl>editeftaccount?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editeftaccount?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a> </#if> <#-- </td> --> <#elseif "COMPANY_CHECK" == paymentMethod.paymentMethodTypeId> @@ -139,7 +139,7 @@ under the License. <#-- </td> --> </#if> <#if security.hasEntityPermission("PAY_INFO", "_DELETE", session)> - <a href="<@ofbizUrl>deletePaymentMethod/viewprofile?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a> + <a href="<@ofbizUrl>deletePaymentMethod/viewprofile?partyId=${partyId}&paymentMethodId=${paymentMethod.paymentMethodId}</@ofbizUrl>">${uiLabelMap.CommonExpire}</a> <#else> </#if> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl Tue Mar 30 21:30:33 2010 @@ -36,7 +36,7 @@ under the License. <#assign roleType = delegator.findOne("RoleType", {"roleTypeId" : productStoreRole.roleTypeId}, true) /> <tr> <td class="button-col"> - <a href="/catalog/control/FindProductStoreRoles?partyId=${productStoreRole.partyId}&productStoreId=${productStore.productStoreId}">${productStore.storeName?default("${uiLabelMap.ProductNoDescription}")} (${productStore.productStoreId})</a> + <a href="/catalog/control/FindProductStoreRoles?partyId=${productStoreRole.partyId}&productStoreId=${productStore.productStoreId}">${productStore.storeName?default("${uiLabelMap.ProductNoDescription}")} (${productStore.productStoreId})</a> </td> <td>${roleType.description?if_exists}</td> </tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl Tue Mar 30 21:30:33 2010 @@ -40,7 +40,7 @@ under the License. <#list inventoryItemList as inventoryItem> <#assign product = inventoryItem.getRelatedOne('Product')?if_exists> <tr> - <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.inventoryItemId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="linktext">${inventoryItem.inventoryItemId}</a></td> + <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${inventoryItem.inventoryItemId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}" class="linktext">${inventoryItem.inventoryItemId}</a></td> <td> <#if product?has_content> <#if product.isVariant?default('N') == 'Y'> @@ -48,7 +48,7 @@ under the License. </#if> <#if product?has_content> <#assign productName = Static['org.ofbiz.product.product.ProductContentWrapper'].getProductContentAsText(product, 'PRODUCT_NAME', request)?if_exists> - <a href="/catalog/control/EditProduct?productId=${product.productId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${productName?default(product.productId)}</a> + <a href="/catalog/control/EditProduct?productId=${product.productId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${productName?default(product.productId)}</a> </#if> </#if> </td> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/UserLogin.ftl Tue Mar 30 21:30:33 2010 @@ -48,10 +48,10 @@ under the License. </td> <td class="button-col"> <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)> - <a href="<@ofbizUrl>editlogin?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> + <a href="<@ofbizUrl>editlogin?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.CommonEdit}</a> </#if> <#if security.hasEntityPermission("SECURITY", "_VIEW", session)> - <a href="<@ofbizUrl>EditUserLoginSecurityGroups?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a> + <a href="<@ofbizUrl>EditUserLoginSecurityGroups?partyId=${party.partyId}&userLoginId=${userUserLogin.userLoginId}</@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a> </#if> </td> </tr> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl Tue Mar 30 21:30:33 2010 @@ -100,7 +100,7 @@ under the License. <#-- <td>${workEffort.partyId}</td> --> <td>${workEffort.roleTypeId}</td> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> - <td class="button-col"><a href="<@ofbizContentUrl>/workeffort/control/acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td> + <td class="button-col"><a href="<@ofbizContentUrl>/workeffort/control/acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate.toString()}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td> </tr> <#assign alt_row = !alt_row> </#list> @@ -129,7 +129,7 @@ under the License. <td>${workEffort.groupPartyId}</td> <#-- <td>${workEffort.roleTypeId}</td> --> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> - <td class="button-col"><a href="<@ofbizContentUrl>/workeffort/control/acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td> + <td class="button-col"><a href="<@ofbizContentUrl>/workeffort/control/acceptassignment?workEffortId=${workEffort.workEffortId}&partyId=${workEffort.partyId}&roleTypeId=${workEffort.roleTypeId}&fromDate=${workEffort.fromDate}</@ofbizContentUrl>">${uiLabelMap.WorkEffortAcceptAssignment} [${workEffort.workEffortId}]</a></td> </tr> <#assign alt_row = !alt_row> </#list> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Tue Mar 30 21:30:33 2010 @@ -39,11 +39,11 @@ under the License. <span class="label"> <#if (visitSize > 0)> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | </#if> ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} <#if highIndex < visitSize> - | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> </#if> </#if> </span> @@ -52,15 +52,15 @@ under the License. <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> - <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td> - <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td> + <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td> </tr> <#assign alt_row = false> <#list visitList as visitObj> @@ -83,11 +83,11 @@ under the License. <span class="label"> <#if (visitSize > 0)> <#if (viewIndex > 1)> - <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | </#if> ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize} <#if highIndex < visitSize> - | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> </#if> </#if> </span> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=929303&r1=929302&r2=929303&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Tue Mar 30 21:30:33 2010 @@ -53,7 +53,7 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.PartyClient}</td> - <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td> + <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyClientUser}</td> @@ -98,13 +98,13 @@ under the License. <div class="align-float"> <span class="label"> <#if 0 < viewIndex> - <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | </#if> <#if 0 < listSize> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} </#if> <#if highIndex < listSize> - | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> </#if> </span> </div> @@ -154,13 +154,13 @@ under the License. <div class="align-float"> <span class="label"> <#if 0 < viewIndex> - <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> | </#if> <#if 0 < listSize> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} </#if> <#if highIndex < listSize> - | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a> </#if> </span> </div> @@ -182,11 +182,11 @@ under the License. <tr> <th>${uiLabelMap.PartyPushURL}</th> <td> - <input type="hidden" name="followerSid" value="${visit.sessionId}"> - <input type="hidden" name="visitId" value="${visit.visitId}"> - <input type="text" name="pageUrl"> + <input type="hidden" name="followerSid" value="${visit.sessionId}" /> + <input type="hidden" name="visitId" value="${visit.visitId}" /> + <input type="text" name="pageUrl" /> </td> - <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}" /></td> </tr> <tr> <td colspan="3"><hr /></td> @@ -196,11 +196,11 @@ under the License. <tr> <th>${uiLabelMap.PartyFollowSession}</th> <td> - <input type="hidden" name="followerSid" value="${visit.sessionId}"> - <input type="hidden" name="visitId" value="${visit.visitId}"> - <input type="text" name="followSid"> + <input type="hidden" name="followerSid" value="${visit.sessionId}" /> + <input type="hidden" name="visitId" value="${visit.visitId}" /> + <input type="text" name="followSid" /> </td> - <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> + <td><input type="submit" value="${uiLabelMap.CommonSubmit}" /></td> </tr> </form> </table> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |