svn commit: r556185 - in /ofbiz/branches/release4.0/app
Locked
svn commit: r556185 - in /ofbiz/branches/release4.0/app
 
|
Author: jleroux
Date: Fri Jul 13 16:34:07 2007 New Revision: 556185 URL: http://svn.apache.org/viewvc?view=rev&rev=556185 Log: Manually merged from trunk (I got a conflict in applications/party/webapp/partymgr/party/editcontactmech.ftl) rev. 556172 Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Fri Jul 13 16:34:07 2007 @@ -150,7 +150,7 @@ <td width="74%"> <select name="stateProvinceGeoId" class='selectBox'> <#if postalAddressData.stateProvinceGeoId?exists><option value='${postalAddressData.stateProvinceGeoId}'>${selectedStateName?default(postalAddressData.stateProvinceGeoId)}</option></#if> - <option value="">${uiLabelMap.PartyNoState}</option> + <option value="">${uiLabelMap.PartyNoState}</option> ${screens.render("component://common/widget/CommonScreens.xml#states")} </select> *</td> @@ -212,8 +212,10 @@ <td width="5"> </td> <td width="74%"> <select name="allowSolicitation" class='selectBox'> - <option>${partyContactMechData.allowSolicitation?if_exists}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${partyContactMechData.allowSolicitation?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> </tr> Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Fri Jul 13 16:34:07 2007 @@ -49,14 +49,14 @@ } } alert(document.getElementById("customerCountry").value); - if ( document.getElementById("customerCountry").value == "USA" + if ( document.getElementById("customerCountry").value == "USA" || document.getElementById("customerCountry").value == "UMI" ) { document.getElementById("customerState").style.display = "block"; } else { document.getElementById("customerState").style.display = "none"; - } - } + } + } </script> </#if> @@ -107,7 +107,7 @@ <option>${uiLabelMap.CommonTitleMrs}</option> <option>${uiLabelMap.CommonTitleMs}</option> <option>${uiLabelMap.CommonTitleDr}</option> - </select> + </select> </div> </div> <div class="form-row"> @@ -191,8 +191,10 @@ <div class="form-label">${uiLabelMap.PartyAllowAddressSolicitation}</div> <div class="form-field"> <select name="CUSTOMER_ADDRESS_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_ADDRESS_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> @@ -221,8 +223,10 @@ ext <input type="text" class='inputBox' name="CUSTOMER_HOME_EXT" value="${requestParameters.CUSTOMER_HOME_EXT?if_exists}" size="6" maxlength="10"> <br/> <select name="CUSTOMER_HOME_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_HOME_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_HOME_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> @@ -236,8 +240,10 @@ ext <input type="text" class='inputBox' name="CUSTOMER_WORK_EXT" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"> <br/> <select name="CUSTOMER_WORK_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_WORK_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_WORK_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> @@ -250,8 +256,10 @@ - <input type="text" class='inputBox' name="CUSTOMER_FAX_CONTACT" value="${requestParameters.CUSTOMER_FAX_CONTACT?if_exists}" size="15" maxlength="15"> <br/> <select name="CUSTOMER_FAX_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_FAX_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_FAX_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> @@ -264,8 +272,10 @@ - <input type="text" class='inputBox' name="CUSTOMER_MOBILE_CONTACT" value="${requestParameters.CUSTOMER_MOBILE_CONTACT?if_exists}" size="15" maxlength="15"> <br/> <select name="CUSTOMER_MOBILE_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_MOBILE_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_MOBILE_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> @@ -285,8 +295,10 @@ <div><input type="text" class='inputBox' name="CUSTOMER_EMAIL" value="${requestParameters.CUSTOMER_EMAIL?if_exists}" size="40" maxlength="255" onchange="changeEmail()" onkeyup="changeEmail()"> *</div> <div> <select name="CUSTOMER_EMAIL_ALLOW_SOL" class='selectBox'> - <option>${requestParameters.CUSTOMER_EMAIL_ALLOW_SOL?default("${uiLabelMap.CommonY}")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${requestParameters.CUSTOMER_EMAIL_ALLOW_SOL?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </div> </div> Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl (original) +++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/custsettings.ftl Fri Jul 13 16:34:07 2007 @@ -85,7 +85,9 @@ <td width="74%"> <select name="homeSol" class="selectBox"> <option>${parameters.homeSol?default("Y")}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> </tr> Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original) +++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/order/genericaddress.ftl Fri Jul 13 16:34:07 2007 @@ -103,11 +103,10 @@ <td width="5"> </td> <td width="74%"> <select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>> - <#if (parameters.allowSolicitation)?exists> - <option>${parameters.allowSolicitation}</option> - <option value="${parameters.allowSolicitation}">---</option> - </#if> - <option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${parameters.allowSolicitatio?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> </tr> Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Fri Jul 13 16:34:07 2007 @@ -54,7 +54,7 @@ </form> <#else> <div class="tabletext">${uiLabelMap.EcommerceNoShoppingListsCreate}.</div> - <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> + <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> </div> </div> @@ -67,7 +67,7 @@ <div class="boxlink"> <a href="<@ofbizUrl>createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateCustRequestFromShoppingList}</a> <a href="<@ofbizUrl>createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateQuoteFromShoppingList}</a> - <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a> + <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a> </div> <div class="boxhead"> ${uiLabelMap.EcommerceShoppingListDetail} - ${shoppingList.listName}</div> </div> @@ -97,13 +97,13 @@ </#list> </select> </td> - </tr> + </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.EcommercePublic}?</div></td> <td> <select name="isPublic" class="selectBox"> - <option value="${shoppingList.isPublic}"><#if shoppingList.isPublic == "Y">${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> - <option value="${shoppingList.isPublic}">--</option> + <option>${shoppingList.isPublic?default("Y")}</option> + <option></option> <option value="Y">${uiLabelMap.CommonY}</option> <option value="N">${uiLabelMap.CommonN}</option> </select> @@ -113,8 +113,8 @@ <td><div class="tableheadtext">${uiLabelMap.EcommerceActive}?</div></td> <td> <select name="isActive" class="selectBox"> - <option value="${shoppingList.isActive}"><#if shoppingList.isActive == "Y">${uiLabelMap.CommonY}<#else>${uiLabelMap.CommonN}</#if></option> - <option value="${shoppingList.isActive}">--</option> + <option>${shoppingList.isActive?default("Y")}</option> + <option></option> <option value="Y">${uiLabelMap.CommonY}</option> <option value="N">${uiLabelMap.CommonN}</option> </select> @@ -136,15 +136,15 @@ <a href="<@ofbizUrl>editShoppingList?shoppingListId=${parentShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGotoParent} (${parentShoppingList.listName?default(parentShoppingList.shoppingListId)})</a> </#if> </td> - </tr> + </tr> <tr> <td><div class="tableheadtext"> </div></td> <td align="left"> - <a href="javascript:document.updateList.submit();" class="buttontext">[${uiLabelMap.CommonSave}]</a> + <a href="javascript:document.updateList.submit();" class="buttontext">[${uiLabelMap.CommonSave}]</a> </td> </tr> </table> - </form> + </form> </div> </div> @@ -323,7 +323,7 @@ </div> <div class="screenlet-body"> <table width="100%" cellspacing="0" cellpadding="1" border="0"> - <tr> + <tr> <td><div class="tabletext"><b>${uiLabelMap.EcommerceListName}</b></div></td> <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td> <td> </td> @@ -335,14 +335,14 @@ <tr> <td nowrap align="left"> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a> - </td> + </td> <td nowrap align="right"> <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> - </td> + </td> <td align="right"> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.EcommerceGoToList}]</a> <a href="<@ofbizUrl>addListToCart?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.EcommerceAddListToCart}]</a> - </td> + </td> </tr> </form> </#list> @@ -351,7 +351,7 @@ <td><div class="tabletext"> </div></td> <td nowrap align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> - </td> + </td> <td><div class="tabletext"> </div></td> </tr> </table> @@ -389,7 +389,7 @@ <tr> <td> <div class="tabletext"> - <a href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${shoppingListItem.productId} - + <a href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${shoppingListItem.productId} - ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} </div> </td> @@ -457,7 +457,7 @@ <td><div class="tabletext"> </div></td> <td nowrap align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> - </td> + </td> <td><div class="tabletext"> </div></td> </tr> </table> Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/custsettings.ftl Fri Jul 13 16:34:07 2007 @@ -46,7 +46,7 @@ <input type="hidden" name="finalizeReqNewShipAddress" value="true"> <tr> <td> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td> <td width="5"> </td> @@ -81,10 +81,10 @@ <td width="74%"> <input type="text" class="inputBox" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/> </td> - </tr> + </tr> <tr> <td colspan="3"> </td> - </tr> + </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td> <td width="5"> </td> @@ -96,7 +96,9 @@ <BR> <select name="homeSol" class="selectBox"> <option>${requestParameters.homeSol?default("Y")}</option> - <option></option><option value="Y">${uiLabelMap.CommonY}</option><option value="N">${uiLabelMap.CommonN}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> </tr> @@ -111,36 +113,40 @@ <BR> <select name="workSol" class="selectBox"> <option>${requestParameters.workSol?default("Y")}</option> - <option></option><option value="Y">${uiLabelMap.CommonY}</option><option value="N">${uiLabelMap.CommonN}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> - </tr> + </tr> <tr> <td colspan="3"> </td> - </tr> + </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255"> + <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255"> <BR> <select name="emailSol" class="selectBox"> <option>${requestParameters.emailSol?default("Y")}</option> - <option></option><option value="Y">${uiLabelMap.CommonY}</option><option value="N">${uiLabelMap.CommonN}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> - </tr> + </tr> <tr> <td colspan="3"> </td> - </tr> + </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonUsername}</div></td> <td width="5"> </td> <td width="74%"> <input type="text" class="inputBox" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/> </td> - </tr> - <#-- + </tr> + <#-- <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderPassword}</div></td> <td width="5"> </td> @@ -161,10 +167,10 @@ <td width="74%"> <input type="text" class="inputBox" name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="40" maxlength="100"> </td> - </tr> - --> - </form> - </table> + </tr> + --> + </form> + </table> </td> </tr> </table> Modified: ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl (original) +++ ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/editcontactmech.ftl Fri Jul 13 16:34:07 2007 @@ -55,7 +55,7 @@ <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}"> + <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> @@ -67,13 +67,13 @@ <a href="javascript:document.editcontactmechform.submit()" class="smallSubmit">${uiLabelMap.CommonSave}</a> </div> <div id="mech-purpose-types"> - <table cellspacing="0"> + <table cellspacing="0"> <#if mechMap.purposeTypes?has_content> <tr> <td class="label">${uiLabelMap.PartyContactPurposes}</td> <td> - <table class="basic-table dark-grid" cellspacing="0"> - <#if mechMap.partyContactMechPurposes?has_content> + <table class="basic-table dark-grid" cellspacing="0"> + <#if mechMap.partyContactMechPurposes?has_content> <#list mechMap.partyContactMechPurposes as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> <tr> @@ -89,7 +89,7 @@ <td class="button-col"><a href="<@ofbizUrl>deletePartyContactMechPurpose?partyId=${partyId}&contactMechId=${contactMechId}&contactMechPurposeTypeId=${partyContactMechPurpose.contactMechPurposeTypeId}&fromDate=${partyContactMechPurpose.fromDate.toString()}&DONE_PAGE=${donePage?replace("=","%3d")}&useValues=true</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonDelete}</a></td> </tr> </#list> - </#if> + </#if> <tr> <form method="post" action="<@ofbizUrl>createPartyContactMechPurpose</@ofbizUrl>" name="newpurposeform"> <input type="hidden" name="partyId" value="${partyId}"> @@ -215,8 +215,10 @@ <td class="label">${uiLabelMap.PartyContactAllowSolicitation}?</td> <td> <select name="allowSolicitation"> - <option>${(mechMap.partyContactMech.allowSolicitation)?if_exists}</option> - <option></option><option>${uiLabelMap.CommonY}</option><option>${uiLabelMap.CommonN}</option> + <option>${mechMap.partyContactMech.allowSolicitation?default("Y")}</option> + <option></option> + <option value="Y">${uiLabelMap.CommonY}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> </tr> Modified: ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/branches/release4.0/applications/product/webapp/catalog/reviews/pendingReviews.ftl Fri Jul 13 16:34:07 2007 @@ -53,9 +53,9 @@ <div class="tabletext"> <select name="postedAnonymous" class="selectBox"> <option>${review.postedAnonymous?default("N")}</option> - <option value="${review.postedAnonymous?default("N")}">----</option> + <option></option> <option value="N">${uiLabelMap.CommonN}</option> - <option value="Y">${uiLabelMap.CommonY}</option> + <option value="Y">${uiLabelMap.CommonY}</option> </select> </div> </td> Modified: ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl?view=diff&rev=556185&r1=556184&r2=556185 ============================================================================== --- ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (original) +++ ofbiz/branches/release4.0/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl Fri Jul 13 16:34:07 2007 @@ -16,20 +16,20 @@ specific language governing permissions and limitations under the License. --> - + <table border="1" cellpadding="2" cellspacing="0"> <tr> <td nowrap><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethodType}</div></td> <td nowrap><div class="tableheadtext">${uiLabelMap.ProductServiceType}</div></td> <td nowrap><div class="tableheadtext">${uiLabelMap.ProductServiceName}</div></td> - <td nowrap><div class="tableheadtext">${uiLabelMap.AccountingPaymentProps}</div></td> - <td nowrap><div class="tableheadtext">${uiLabelMap.ApplyToAll}</div></td> + <td nowrap><div class="tableheadtext">${uiLabelMap.AccountingPaymentProps}</div></td> + <td nowrap><div class="tableheadtext">${uiLabelMap.ApplyToAll}</div></td> <td nowrap><div class="tabletext"> </div></td> </tr> <#list paymentSettings as setting> <#assign payMeth = setting.getRelatedOne("PaymentMethodType")> - <#assign enum = setting.getRelatedOne("Enumeration")> - <tr> + <#assign enum = setting.getRelatedOne("Enumeration")> + <tr> <td><div class="tabletext">${payMeth.get("description",locale)}</div></td> <td><div class="tabletext">${enum.get("description",locale)}</div></td> <td><div class="tabletext">${setting.paymentService?default("${uiLabelMap.CommonNA}")}</div></td> @@ -37,11 +37,11 @@ <td><div class="tabletext">${setting.applyToAllProducts?if_exists}</div></td> <td align="center" nowrap> <div class="tabletext"><#if security.hasEntityPermission("CATALOG", "_DELETE", session)><a href="<@ofbizUrl>storeRemovePaySetting?productStoreId=${productStoreId}&paymentMethodTypeId=${setting.paymentMethodTypeId}&paymentServiceTypeEnumId=${setting.paymentServiceTypeEnumId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonDelete}]</a></#if> <a href="<@ofbizUrl>EditProductStorePaySetup?productStoreId=${productStoreId}&paymentMethodTypeId=${setting.paymentMethodTypeId}&paymentServiceTypeEnumId=${setting.paymentServiceTypeEnumId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div> - </td> + </td> </tr> </#list> </table> - + <br/> <#if security.hasEntityPermission("CATALOG", "_CREATE", session)> <#if editSetting?has_content> @@ -57,7 +57,7 @@ <tr> <td><span class="tableheadtext">${uiLabelMap.AccountingPaymentMethodType}</span></td> <td> - <select name="paymentMethodTypeId" class="selectBox"> + <select name="paymentMethodTypeId" class="selectBox"> <#if editSetting?has_content> <#assign paymentMethodType = editSetting.getRelatedOne("PaymentMethodType")> <option value="${editSetting.paymentMethodTypeId}">${paymentMethodType.get("description",locale)}</option> @@ -72,12 +72,12 @@ <tr> <td><span class="tableheadtext">${uiLabelMap.ProductServiceType}</span></td> <td> - <select name="paymentServiceTypeEnumId" class="selectBox"> + <select name="paymentServiceTypeEnumId" class="selectBox"> <#if editSetting?has_content> <#assign enum = editSetting.getRelatedOne("Enumeration")> <option value="${editSetting.paymentServiceTypeEnumId}">${enum.get("description",locale)}</option> <option value="${editSetting.paymentServiceTypeEnumId}">---</option> - </#if> + </#if> <#list serviceTypes as type> <option value="${type.enumId}">${type.get("description",locale)}</option> </#list> @@ -85,29 +85,27 @@ </td> </tr> <tr> - <td><span class="tableheadtext">${uiLabelMap.ProductServiceName}</span></td> + <td><span class="tableheadtext">${uiLabelMap.ProductServiceName}</span></td> <td><input type="text" size="30" name="paymentService" class="inputBox" value="${(editSetting.paymentService)?if_exists}"/></td> </tr> <tr> <td><span class="tableheadtext">${uiLabelMap.AccountingPaymentProperties}</span></td> - <td><input type="text" size="30" name="paymentPropertiesPath" class="inputBox" value="${(editSetting.paymentPropertiesPath)?if_exists}"/></td> - </tr> + <td><input type="text" size="30" name="paymentPropertiesPath" class="inputBox" value="${(editSetting.paymentPropertiesPath)?if_exists}"/></td> + </tr> <tr> <td><span class="tableheadtext">${uiLabelMap.ApplyToAll} ${uiLabelMap.ProductProducts}</span></td> <td> <select name="applyToAllProducts" class="smallSelect"> - <#if (editSetting.applyToAllProducts)?has_content> - <option>${editSetting.applyToAllProducts}</option> - <option value="${editSetting.applyToAllProducts}">---</option> - </#if> + <option>${editSetting.applyToAllProducts?default("Y")}</option> + <option></option> <option value="Y">${uiLabelMap.CommonY}</option> - <option value="N">${uiLabelMap.CommonN}</option> + <option value="N">${uiLabelMap.CommonN}</option> </select> </td> - </tr> + </tr> <tr> <td><input type="submit" class="smallSubmit" value="${buttonText}"/></td> </tr> - </table> + </table> </form> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |