svn commit: r932719 [1/2] - in /ofbiz/trunk/specialpurpose/ec
Locked
svn commit: r932719 [1/2] - in /ofbiz/trunk/specialpurpose/ec
 
|
Author: buscob
Date: Sat Apr 10 13:50:12 2010 New Revision: 932719 URL: http://svn.apache.org/viewvc?rev=932719&view=rev Log: A patch from Blas Rodriguez Somoza OFBIZ-3614 - XHTML validation errors (specialpurpose_ecommerce) https://issues.apache.org/jira/browse/OFBIZ-3614 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: viewprofile.ftl Wrong markup at 248, 250. Entity without final ;  </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl Sat Apr 10 13:50:12 2010 @@ -51,7 +51,7 @@ under the License. <#else> <#-- standard question options --> - <td align='right' nowrap> + <td align='right' nowrap="nowrap"> <#assign answerString = "answers"> <#if (results._total?default(0) == 1)> <#assign answerString = "answer"> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl Sat Apr 10 13:50:12 2010 @@ -59,8 +59,8 @@ under the License. </div> <div style="padding-top: 10px;" class="insideHeaderText"> <form action="#"> - <input type="text" class="inputBox" name="search" size="20"> - <input type="submit" class="smallSubmit" value="Search"> + <input type="text" class="inputBox" name="search" size="20" /> + <input type="submit" class="smallSubmit" value="Search" /> </form> </div> </td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl Sat Apr 10 13:50:12 2010 @@ -25,14 +25,14 @@ under the License. <#assign currentSearchCategoryName = categoryContentWrapper.get("CATEGORY_NAME")?string /> <#list searchConstraintStrings as searchConstraintString> <#if searchConstraintString.indexOf(currentSearchCategoryName) != -1> - <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if previousCategoryId?exists>&searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a><#noescape> ${searchConstraintString}</#noescape></div> + <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if previousCategoryId?exists>&searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a><#noescape> ${searchConstraintString}</#noescape></div> </#if> </#list> </#if> </#escape> <#list searchConstraintStrings as searchConstraintString> <#if searchConstraintString.indexOf("Category: ") = -1 && searchConstraintString != "Exclude Variants"> - <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> + <div id="searchConstraints"> <a href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#if> </#list> <#if showSubCats> @@ -42,7 +42,7 @@ under the License. <#list subCategoryList as category> <#assign subCategoryContentWrapper = category.categoryContentWrapper /> <#assign categoryName = subCategoryContentWrapper.get("CATEGORY_NAME")?if_exists?string /> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&searchCategoryId=${category.productCategoryId}&clearSearch=N</@ofbizUrl>">${categoryName?if_exists} (${category.count})</li> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&searchCategoryId=${category.productCategoryId}&clearSearch=N</@ofbizUrl>">${categoryName?if_exists} (${category.count})</li> </#list> </ul> </div> @@ -52,7 +52,7 @@ under the License. <strong>${colorFeatureType.description}</strong> <ul> <#list colors as color> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</li> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?pft_${color.productFeatureTypeId}=${color.productFeatureId}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>">${color.description} (${color.featureCount})</li> </#list> </ul> </div> @@ -62,7 +62,7 @@ under the License. <strong>${uiLabelMap.EcommercePriceRange}</strong> <ul> <#list priceRangeList as priceRange> - <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?LIST_PRICE_LOW=${priceRange.low}&LIST_PRICE_HIGH=${priceRange.high}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>"><@ofbizCurrency amount=priceRange.low /> - <@ofbizCurrency amount=priceRange.high /> (${priceRange.count})</a><li> + <li><a href="<@ofbizUrl>category/~category_id=${productCategoryId}?LIST_PRICE_LOW=${priceRange.low}&LIST_PRICE_HIGH=${priceRange.high}&clearSearch=N<#if currentSearchCategory?exists>&searchCategoryId=${currentSearchCategory.productCategoryId}</#if></@ofbizUrl>"><@ofbizCurrency amount=priceRange.low /> - <@ofbizCurrency amount=priceRange.high /> (${priceRange.count})</a><li> </#list> </ul> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl Sat Apr 10 13:50:12 2010 @@ -23,7 +23,7 @@ under the License. <input type="hidden" name="VIEW_SIZE" value="10"/> <input type="hidden" name="PAGING" value="Y"/> <table> - <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}"> + <input type="hidden" name="SEARCH_CATALOG_ID" value="${currentCatalogId}" /> <#if searchCategory?has_content> <input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}"/> <tr valign="middle"> @@ -41,9 +41,9 @@ under the License. </#if> <tr valign="middle"> <td class="label">${uiLabelMap.ProductKeywords}</td> - <td><input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"> - ${uiLabelMap.CommonAny} <input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>> - ${uiLabelMap.CommonAll} <input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>> + <td><input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}" /> + ${uiLabelMap.CommonAny} <input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /> + ${uiLabelMap.CommonAll} <input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /> </td> </tr> <#list productFeatureTypeIdsOrdered as productFeatureTypeId> @@ -117,7 +117,7 @@ under the License. <#-- searchOptions type is ProductSearchSession.ProductSearchOptions --> <div> ${uiLabelMap.EcommerceSearchNumber}${searchOptions_index + 1} - <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> + <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a> <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a> </div> <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Sat Apr 10 13:50:12 2010 @@ -205,7 +205,7 @@ function getConfigDetails(event) { <#assign productLargeImageUrl = firstLargeImage> </#if> <#if productLargeImageUrl?string?has_content> - <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left'></a> + <a href="javascript:popupDetail();"><img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${productLargeImageUrl?if_exists}</@ofbizContentUrl>' name='mainImage' vspace='5' hspace='5' border='0' width='200' align='left' /></a> </#if> </td> <td align="right" valign="top"> @@ -308,17 +308,17 @@ function getConfigDetails(event) { </select> </div> </#list> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='NULL'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='NULL' /> <#else> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='NULL'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='NULL' /> <div class='tabletext'><b>${uiLabelMap.ProductItemOutOfStock}.</b></div> <#assign inStock = false> </#if> <#else> - <input type='hidden' name="product_id" value='${product.productId}'> - <input type='hidden' name="add_product_id" value='${product.productId}'> + <input type='hidden' name="product_id" value='${product.productId}' /> + <input type='hidden' name="add_product_id" value='${product.productId}' /> <#if productNotAvailable?exists> <#assign isStoreInventoryRequired = Static["org.ofbiz.product.store.ProductStoreWorker"].isStoreInventoryRequired(request, product)> <#if isStoreInventoryRequired> @@ -349,18 +349,18 @@ function getConfigDetails(event) { </#if> <div id="add_amount" class="${hiddenStyle}"> <span style="white-space: nowrap;"><b>Amount:</b></span> - <input type="text" size="5" name="add_amount" value=""> + <input type="text" size="5" name="add_amount" value="" /> </div> <#if !configwrapper.isCompleted()> <div>[${uiLabelMap.EcommerceProductNotConfigured}] - <input type="text" size="5" name="quantity" value="0" disabled></div> + <input type="text" size="5" name="quantity" value="0" disabled="disabled" /></div> <#else> <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> - <input type="text" size="5" name="quantity" value="1" > + <input type="text" size="5" name="quantity" value="1" /> </#if> </#if> <#if requestParameters.category_id?exists> - <input type='hidden' name='category_id' value='${requestParameters.category_id}'> + <input type='hidden' name='category_id' value='${requestParameters.category_id}' /> </#if> </#if> </form> @@ -368,9 +368,9 @@ function getConfigDetails(event) { <#if sessionAttributes.userLogin?has_content && sessionAttributes.userLogin.userLoginId != "anonymous"> <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type="hidden" name="productId" value="${product.productId}"> - <input type="hidden" name="product_id" value="${product.productId}"> - <input type="hidden" name="configId" value="${configId?if_exists}"> + <input type="hidden" name="productId" value="${product.productId}" /> + <input type="hidden" name="product_id" value="${product.productId}" /> + <input type="hidden" name="configId" value="${configId?if_exists}" /> <select name="shoppingListId"> <#if shoppingLists?has_content> <#list shoppingLists as shoppingList> @@ -381,7 +381,7 @@ function getConfigDetails(event) { <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> - <input type="text" size="5" name="quantity" value="1"> + <input type="text" size="5" name="quantity" value="1" /> <a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a> </form> <#else> <br /> @@ -414,7 +414,7 @@ function getConfigDetails(event) { <#assign imageUrl = "/images/defaultImage.jpg"> </#if> <td align="center" valign="bottom"> - <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60"></a> + <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" border="0" width="60" height="60" /></a> <br /> <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a> </td> @@ -439,18 +439,18 @@ function getConfigDetails(event) { </td> </tr> - <tr><td colspan="2"><hr class='sepbar'></td></tr> + <tr><td colspan="2"><hr class='sepbar'/></td></tr> <#-- Any attributes/etc may go here --> <#-- Product Configurator --> <tr> <td colspan="2"> <form name="configform" id="configFormId" method="post" action="<@ofbizUrl>product<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> - <input type='hidden' name='add_product_id' value='${product.productId}'> - <input type='hidden' name='add_category_id' value=''> - <input type='hidden' name='quantity' value='1'> + <input type='hidden' name='add_product_id' value='${product.productId}' /> + <input type='hidden' name='add_category_id' value='' /> + <input type='hidden' name='quantity' value='1' /> - <input type='hidden' name='product_id' value='${product.productId}'> + <input type='hidden' name='product_id' value='${product.productId}' /> <table > <tr> <td> @@ -475,7 +475,7 @@ function getConfigDetails(event) { </#if> <#assign image = question.content.get("IMAGE_URL")?if_exists> <#if image?string?has_content> - <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left'> + <img src='<@ofbizContentUrl>${contentPathPrefix?if_exists}${image?if_exists}</@ofbizContentUrl>' vspace='5' hspace='5' border='0' width='200' align='left' /> </#if> <#else> <div><a href='#${question.getConfigItem().getString("configItemId")}' class="buttontext">Details</a></div> @@ -503,7 +503,7 @@ function getConfigDetails(event) { <#if renderSingleChoiceWithRadioButtons?exists && "Y" == renderSingleChoiceWithRadioButtons> <#-- This is the radio button implementation --> <#if !question.isMandatory()> - <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>'> No option</div> + <div><input type="radio" name='${counter}' value='<#if !question.isSelected()>checked</#if>' /> No option</div> </#if> <#assign optionCounter = 0> <#list options as option> @@ -516,7 +516,7 @@ function getConfigDetails(event) { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > - <input type='radio' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"> + <input type='radio' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> <#assign components = option.getComponents()> <#list components as component> @@ -531,7 +531,7 @@ function getConfigDetails(event) { </div> <#else> <div> - <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked</#if>> + <input type="radio" name='${counter}' value='${optionCounter}' <#if option.isSelected() || (!question.isSelected() && optionCounter == 0 && question.isMandatory())>checked="checked"</#if> /> ${option.description} <#if (shownPrice > 0)>+<@ofbizCurrency amount=shownPrice isoCode=price.currencyUsed/> </#if> <#if (shownPrice < 0)>-<@ofbizCurrency amount=(-1*shownPrice) isoCode=price.currencyUsed/> </#if> @@ -576,7 +576,7 @@ function getConfigDetails(event) { <#-- Render virtual compoennts --> <#if option.hasVirtualComponent()> <div > - <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');"> + <input type='CHECKBOX' name='${counter}' id="${counter}_${optionCounter}" value='${optionCounter}' onclick="javascript:checkOptionVariants('${counter}_${optionCounter}');" /> ${option.description} <#if !option.isAvailable()> (*)</#if> <#assign components = option.getComponents()> <#list components as component> @@ -591,7 +591,7 @@ function getConfigDetails(event) { </div> <#else> <div> - <input type='CHECKBOX' name='${counter}' value='${optionCounter}' <#if option.isSelected()>checked</#if>> + <input type='CHECKBOX' name='${counter}' value='${optionCounter}' <#if option.isSelected()>checked="checked"</#if> /> ${option.description} +<@ofbizCurrency amount=option.price isoCode=price.currencyUsed/><#if !option.isAvailable()> (*)</#if> </div> </#if> @@ -619,7 +619,7 @@ function getConfigDetails(event) { </#if> </td> </tr> - <tr><td colspan="2"><hr class='sepbar'></td></tr> + <tr><td colspan="2"><hr class='sepbar'/></td></tr> <#if productReviews?has_content> <#list productReviews as productReview> <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")> @@ -655,7 +655,7 @@ function getConfigDetails(event) { </#list> <tr> <td colspan="2"> - <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReviewThisProduct}!</a> + <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReviewThisProduct}!</a> </td> </tr> <#else> @@ -666,7 +666,7 @@ function getConfigDetails(event) { </tr> <tr> <td colspan="2"> - <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a> + <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/detailImage.ftl Sat Apr 10 13:50:12 2010 @@ -20,7 +20,7 @@ under the License. <body> <#if requestParameters.detail?has_content> <#--assign detailImage = Static["org.ofbiz.base.util.Base64"].base64Decode(requestParameters.detail)--> - <img src="${requestParameters.detail}"> + <img src="${requestParameters.detail}" alt="" /> <#else> <script language="JavaScript" type="text/javascript"> <!-- // Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastproductsearches.ftl Sat Apr 10 13:50:12 2010 @@ -36,7 +36,7 @@ under the License. ${uiLabelMap.EcommerceSearchNumber} ${searchOptions_index + 1} <ul> <li> - <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="button">${uiLabelMap.CommonSearch}</a> + <a href="<@ofbizUrl>setCurrentSearchFromHistoryAndSearch?searchHistoryIndex=${searchOptions_index}&clearSearch=N</@ofbizUrl>" class="button">${uiLabelMap.CommonSearch}</a> <a href="<@ofbizUrl>setCurrentSearchFromHistory?searchHistoryIndex=${searchOptions_index}</@ofbizUrl>" class="button">${uiLabelMap.CommonRefine}</a> </li> <#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Sat Apr 10 13:50:12 2010 @@ -546,7 +546,7 @@ ${virtualJavaScript?if_exists} <label>End Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a> </div> <div> - <#--td nowrap align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td--> + <#--td nowrap="nowrap" align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap="nowrap"> </td--> Number of persons<input type="text" size="4" name="reservPersons" value="2"/> Number of rooms<input type="text" size="5" name="quantity" value="1"/> </div> @@ -589,7 +589,7 @@ ${virtualJavaScript?if_exists} </select> <#if product.productTypeId?if_exists == "ASSET_USAGE"> - ${uiLabelMap.CommonStartDate} (yyyy-mm-dd)<input type="text" size="10" name="reservStartStr" >Number of days<input type="text" size="4" name="reservLength"> Number of persons<input type="text" size="4" name="reservPersons" value="1">Qty <input type="text" size="5" name="quantity" value="1"> + ${uiLabelMap.CommonStartDate} (yyyy-mm-dd)<input type="text" size="10" name="reservStartStr" />Number of days<input type="text" size="4" name="reservLength" /> Number of persons<input type="text" size="4" name="reservPersons" value="1" />Qty <input type="text" size="5" name="quantity" value="1" /> <#else> <input type="text" size="5" name="quantity" value="1" /> <input type="hidden" name="reservStartStr" value= "" /> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Sat Apr 10 13:50:12 2010 @@ -24,9 +24,9 @@ under the License. <body class="ecbody"> <form name="tellafriend" action="<@ofbizUrl>emailFriend</@ofbizUrl>" method="post"> <#if requestParameters.productId?exists> - <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/product?product_id=${requestParameters.productId}</@ofbizUrl>"> + <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/product?product_id=${requestParameters.productId}</@ofbizUrl>" /> <#elseif requestParameters.categoryId?exists> - <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/category?category_id=${requestParameters.categoryId}</@ofbizUrl>"> + <input type="hidden" name="pageUrl" value="<@ofbizUrl fullPath="true" encode="false" secure="false">/category?category_id=${requestParameters.categoryId}</@ofbizUrl>" /> <#else> <#assign cancel = "Y"> </#if> @@ -34,11 +34,11 @@ under the License. <table> <tr> <td>${uiLabelMap.CommonYouremail}:</td> - <td><input type="text" name="sendFrom" size="30"></td> + <td><input type="text" name="sendFrom" size="30" /></td> </tr> <tr> <td>${uiLabelMap.CommonEmailTo}:</td> - <td><input type="text" name="sendTo" size="30"></td> + <td><input type="text" name="sendTo" size="30" /></td> </tr> <tr> <td colspan="2" align="center">${uiLabelMap.CommonMessage}</td> @@ -50,7 +50,7 @@ under the License. </tr> <tr> <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonSend}"> + <input type="submit" value="${uiLabelMap.CommonSend}" /> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl Sat Apr 10 13:50:12 2010 @@ -42,8 +42,8 @@ under the License. </td> <td align="right" valign="middle"> <div class="tabletext"> - ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked> - ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any"> + ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked" /> + ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any" /> </div> </td> </tr> @@ -78,8 +78,8 @@ under the License. </#list> <div class="tabletext">${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div> <div class="tabletext"> - ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked> - ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"> + ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /> + ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /> </div> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Sat Apr 10 13:50:12 2010 @@ -31,14 +31,14 @@ under the License. <#if !supplierProduct?exists> <h1>${uiLabelMap.EcommerceAddNewDigitalProduct}</h1> <form method="post" action="<@ofbizUrl>createCustomerDigitalDownloadProduct</@ofbizUrl>" name="editdigitaluploadform" style="margin: 0;"> - <input type="hidden" name="productStoreId" value="${productStore.productStoreId}"> + <input type="hidden" name="productStoreId" value="${productStore.productStoreId}" /> <#else> <h1>${uiLabelMap.EcommerceUpdateDigitalProduct}</h1> <form method="post" action="<@ofbizUrl>updateCustomerDigitalDownloadProduct</@ofbizUrl>" name="editdigitaluploadform" style="margin: 0;"> - <input type="hidden" name="productId" value="${parameters.productId}"> - <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}"> - <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}"> - <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}"> + <input type="hidden" name="productId" value="${parameters.productId}" /> + <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}" /> + <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}" /> + <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}" /> </#if> <a href="<@ofbizUrl>digitalproductlist</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBackToList}</a> @@ -86,10 +86,10 @@ under the License. <div class="tableheadtext">${uiLabelMap.EcommerceDigitalAddFromMyFiles}</div> <div> <form method="post" action="<@ofbizUrl>addCustomerDigitalDownloadProductFile</@ofbizUrl>" name="adddigitaluploadfile" style="margin: 0;"> - <input type="hidden" name="productId" value="${parameters.productId}"> - <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}"> - <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}"> - <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}"> + <input type="hidden" name="productId" value="${parameters.productId}" /> + <input type="hidden" name="currencyUomId" value="${parameters.currencyUomId}" /> + <input type="hidden" name="minimumOrderQuantity" value="${parameters.minimumOrderQuantity}" /> + <input type="hidden" name="availableFromDate" value="${parameters.availableFromDate}" /> <select name="contentId" class="selectBox"> <#list ownerContentAndRoleList as ownerContentAndRole> <option value="${ownerContentAndRole.contentId}">${ownerContentAndRole.contentName}</option> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Sat Apr 10 13:50:12 2010 @@ -27,7 +27,7 @@ under the License. <#else> <h1>${uiLabelMap.PageTitleEditEFTAccount}</h1> <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> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelDone}</a> <a href="javascript:document.editeftaccountform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> @@ -37,28 +37,28 @@ under the License. <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}" /> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}"> + <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}" /> *</td> </tr> <tr> @@ -77,14 +77,14 @@ under the License. <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}"> + <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> </td> </tr> @@ -100,7 +100,7 @@ under the License. <#if curPostalAddress?exists> <tr> <td align="right" valign="top" width="1%"> - <input type="radio" name="contactMechId" value="${curContactMechId}" checked> + <input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" /> </td> <td valign="top" width="80%"> <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div> @@ -146,7 +146,7 @@ under the License. <#assign partyContactMech = postalAddressInfo.partyContactMech> <tr> <td align="right" valign="top" width="1%"> - <input type="radio" name="contactMechId" value="${contactMech.contactMechId}"> + <input type="radio" name="contactMechId" value="${contactMech.contactMechId}" /> </td> <td valign="top" width="80%"> <#list partyContactMechPurposes as partyContactMechPurpose> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Sat Apr 10 13:50:12 2010 @@ -27,7 +27,7 @@ under the License. <#else> <h1>${uiLabelMap.AccountingEditGiftCard}</h1> <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> <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonCancelDone}]</a> <a href="javascript:document.editgiftcardform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a> @@ -52,14 +52,14 @@ under the License. </#if> </#if> </#if> - <input type="text" class="inputBox" size="20" maxlength="60" name="cardNumber" value="${pcardNumberDisplay?if_exists}"> + <input type="text" class="inputBox" size="20" maxlength="60" name="cardNumber" value="${pcardNumberDisplay?if_exists}" /> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}"> + <input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" /> </td> </tr> <tr> @@ -103,7 +103,7 @@ under the License. <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" /> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl Sat Apr 10 13:50:12 2010 @@ -46,19 +46,19 @@ under the License. <tr><td colspan="2"> </td></tr> </#if> <form method="post" action="<@ofbizUrl>querygcbalance</@ofbizUrl>"> - <input type="hidden" name="currency" value="USD"> - <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}"> + <input type="hidden" name="currency" value="USD" /> + <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}" /> <tr> <td><div class="tableheadtext">${uiLabelMap.AccountingCardNumber}</div></td> - <td><input type="text" class="inputBox" name="cardNumber" size="20" value="${(requestParameters.cardNumber)?if_exists}"></td> + <td><input type="text" class="inputBox" name="cardNumber" size="20" value="${(requestParameters.cardNumber)?if_exists}" /></td> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.AccountingPINNumber}</div></td> - <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)?if_exists}"></td> + <td><input type="text" class="inputBox" name="pin" size="15" value="${(requestParameters.pin)?if_exists}" /></td> </tr> <tr><td colspan="2"> </td></tr> <tr> - <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckBalance}"></td> + <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCheckBalance}" /></td> </tr> </form> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl Sat Apr 10 13:50:12 2010 @@ -23,9 +23,9 @@ under the License. <br /> <form name="gclink" method="post" action="<@ofbizUrl>linkgiftcard</@ofbizUrl>"> - <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}"> + <input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}" /> <#if userLogin?has_content> - <input type="hidden" name="partyId" value="${userLogin.partyId}"> + <input type="hidden" name="partyId" value="${userLogin.partyId}" /> </#if> <table align="center"> <tr> @@ -35,11 +35,11 @@ under the License. </tr> <tr> <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> - <td><input type="text" class="inputBox" name="physicalCard" size="20"></td> + <td><input type="text" class="inputBox" name="physicalCard" size="20" /></td> </tr> <tr> <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td> - <td><input type="text" class="inputBox" name="physicalPin" size="20"></td> + <td><input type="text" class="inputBox" name="physicalPin" size="20" /></td> </tr> <tr> <td colspan="2"> </td> @@ -51,17 +51,17 @@ under the License. </tr> <tr> <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> - <td><input type="text" class="inputBox" name="virtualCard" size="20"></td> + <td><input type="text" class="inputBox" name="virtualCard" size="20" /></td> </tr> <tr> <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td> - <td><input type="text" class="inputBox" name="virtualPin" size="20"></td> + <td><input type="text" class="inputBox" name="virtualPin" size="20" /></td> </tr> <tr> <td colspan="2"> </td> </tr> <tr> - <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceLinkCards}"></td> + <td colspan="2" align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceLinkCards}" /></td> </tr> </table> </form> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat Apr 10 13:50:12 2010 @@ -245,9 +245,9 @@ under the License. <div class="tabletext"> ${uiLabelMap.AccountingCreditCard}: <#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> ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)} Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl Sat Apr 10 13:50:12 2010 @@ -44,7 +44,7 @@ under the License. <#if dataResourceId?exists> <br /> - <img src="<@ofbizUrl>img?imgId=${dataResourceId}</@ofbizUrl>" /> + <img src="<@ofbizUrl>img?imgId=${dataResourceId}</@ofbizUrl>" alt=""/> </#if> <br /> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl Sat Apr 10 13:50:12 2010 @@ -75,11 +75,11 @@ under the License. <#if content?has_content>${content.description?if_exists}</#if> </td> <td width="40px" valign="bottom"> -<a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv?if_exists}&forumId=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> +<a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${thisSubContentId}&nodeTrailCsv=${thisNodeTrailCsv?if_exists}&forumId=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.CommonView}</a> </td> <@checkPermission mode="equals" entityOperation="_UPDATE" subContentId=content.contentId targetOperation="CONTENT_UPDATE" contentPurposeList="ARTICLE"> <td width="40px" valign="bottom"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx?if_exists},${content.contentId}</@ofbizUrl>" >${uiLabelMap.CommonEdit}</a> +<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>editforumarticle?contentIdTo=${content.contentId}&nodeTrailCsv=${contentIdx?if_exists},${content.contentId}</@ofbizUrl>" >${uiLabelMap.CommonEdit}</a> </td> </@checkPermission> </tr> @@ -102,7 +102,7 @@ under the License. </#if> <@checkPermission mode="equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> <tr><td align="right"> -<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>createforumarticle?forumId=${contentIdx?if_exists}&nodeTrailCsv=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a> +<a class="tabButton" style="height:14pt;" href="<@ofbizUrl>createforumarticle?forumId=${contentIdx?if_exists}&nodeTrailCsv=${contentIdx?if_exists}</@ofbizUrl>" >${uiLabelMap.ProductNewArticle}</a> </td></tr> </@checkPermission> <@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx> @@ -136,9 +136,9 @@ ${uiLabelMap.EcommerceLoggedToPost} <td > ${indent} <#if content.contentTypeId == "WEB_SITE_PUB_PT" > - <a class="tabButton" href="<@ofbizUrl>showforum?forumId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>showforum?forumId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}</a> ${content.contentName?if_exists} <#else> - <a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}to</a> ${content.contentName?if_exists} + <a class="tabButton" href="<@ofbizUrl>showforumarticle?contentId=${content.contentId?if_exists}&nodeTrailCsv=${csv}</@ofbizUrl>" >${uiLabelMap.CommonBackTo}to</a> ${content.contentName?if_exists} </#if> <#local indent = indent + " "> [${content.contentId?if_exists}]</td> @@ -177,7 +177,7 @@ ${uiLabelMap.EcommerceLoggedToPost} <tr><td> <#if 0 < listSz?number> <#if 0 < viewIdx?number> - <a href="${requestURL}?${queryString}&viewSz=${viewSz}&viewIdx=${viewIdx?number-1}" class="submenutext">${uiLabelMap.CommonPrevious}</a> + <a href="${requestURL}?${queryString}&viewSz=${viewSz}&viewIdx=${viewIdx?number-1}" class="submenutext">${uiLabelMap.CommonPrevious}</a> <#else> <span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span> </#if> @@ -185,7 +185,7 @@ ${uiLabelMap.EcommerceLoggedToPost} <span class="submenutextinfo">${lowIdxShow} - ${highIdx?if_exists} ${uiLabelMap.CommonOf} ${listSz?if_exists}</span> </#if> <#if highIdx?if_exists?number < listSz?if_exists?number> - <a href="${requestURL}?${queryString?if_exists}&viewSz=${viewSz?if_exists}&viewIdx=${viewIdx?if_exists?number+1}" class="submenutextright">${uiLabelMap.CommonNext}</a> + <a href="${requestURL}?${queryString?if_exists}&viewSz=${viewSz?if_exists}&viewIdx=${viewIdx?if_exists?number+1}" class="submenutextright">${uiLabelMap.CommonNext}</a> <#else> <span class="submenutextrightdisabled">${uiLabelMap.CommonNext}</span> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Sat Apr 10 13:50:12 2010 @@ -36,15 +36,15 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editforuminfo?contentId=${contentId?if_exists}&nodeTrailCsv=${nodeTrailCsv?if_exists}&contentIdTo=${contentIdTo?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editforuminfo?contentId=${contentId?if_exists}&nodeTrailCsv=${nodeTrailCsv?if_exists}&contentIdTo=${contentIdTo?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceContentInformation}</h3> <div class="screenlet-body"> <table> - <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.ProductContentId}</b></div></td><td> </td><td><div class='tabletext'>${contentId?if_exists}</div></td></tr> - <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.EcommerceContentName}</b></div></td><td> </td><td><div class='tabletext'>${contentName?if_exists}</div></td></tr> - <tr><td align="right" nowrap><div class='tabletext'><b>${uiLabelMap.CommonDescription}</b></div></td><td> </td><td><div class='tabletext'>${description?if_exists}<div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.ProductContentId}</b></div></td><td> </td><td><div class='tabletext'>${contentId?if_exists}</div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.EcommerceContentName}</b></div></td><td> </td><td><div class='tabletext'>${contentName?if_exists}</div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>${uiLabelMap.CommonDescription}</b></div></td><td> </td><td><div class='tabletext'>${description?if_exists}<div></td></tr> </table> </div> </div> @@ -52,14 +52,14 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddimage?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=IMAGE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceImageInformation}</h3> <div class="screenlet-body"> <table> - <tr><td align="right" nowrap><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> - <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" /> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'>${uiLabelMap.EcommerceImage}</div></td><td> </td><td><div class='tabletext'> + <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" /> <div></td></tr> </table> </div> @@ -67,7 +67,7 @@ under the License. <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=SUMMARY&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3>${uiLabelMap.EcommerceSummaryInformation}</h3> <div class="screenlet-body"> @@ -81,12 +81,12 @@ ${summaryData?if_exists} <div class="screenlet"> <div class="boxlink"> - <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> + <a href="<@ofbizUrl>editaddforumdata?contentIdTo=${contentId?if_exists}&dataResourceId=${txtDataResourceId?if_exists}&mapKey=ARTICLE&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonUpdate}</a> </div> <h3> ${uiLabelMap.EcommerceArticleInformation}</h3> <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0" cellspacing='0'> - <tr><td align="right" nowrap><div class='tabletext'><b>Article</b></div></td><td> </td><td><div class='tabletext'> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Article</b></div></td><td> </td><td><div class='tabletext'> ${textData?if_exists} <div></td></tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl Sat Apr 10 13:50:12 2010 @@ -30,18 +30,18 @@ under the License. <select name="pageSelect" class="selectBox" onchange="window.location=this[this.selectedIndex].value;"> <option value="#">${uiLabelMap.CommonPage} ${viewIndex?int+1} ${uiLabelMap.CommonOf} ${viewIndexMax}</option> <#list 1..viewIndexMax as curViewNum> - <option value="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${curViewNum?int-1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum}</option> + <option value="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${curViewNum?int-1}</@ofbizUrl>">${uiLabelMap.CommonGotoPage} ${curViewNum}</option> </#list> </select> <b> <#if (viewIndex?int >0)> - <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int-1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> <#if (listSize?int > 0)> <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> </#if> <#if highIndex?int < listSize?int> - | <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>showforum?forumId=${parameters.forumId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex?int+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </b> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Sat Apr 10 13:50:12 2010 @@ -28,7 +28,7 @@ under the License. </#if> <div class="tableheadtext"> ${uiLabelMap.CommonTitle}: ${forumMessage.contentName?if_exists} ${uiLabelMap.CommonBy}:${forumMessage.createdByUserLogin?if_exists} ${uiLabelMap.CommonAt}: ${forumMessage.createdDate?if_exists.toString().substring(0,16)} - <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> + <a href="ViewForumMessage?forumId=${parameters.forumId}&responseContentId=${forumMessage.contentId}&threadContentId=${threadContentId?if_exists}" class="buttontext">${uiLabelMap.CommonView}</a> </div> <div class="tableheadtext"> ${forumMessage.description?if_exists} @@ -39,7 +39,7 @@ under the License. <#if (result.resultData)?exists> <div class="tableheadtext"> ${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)} - <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> + <a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a> </div> <div class="tabletext"> <#if result.resultData.electronicText?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Sat Apr 10 13:50:12 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<SCRIPT language="javascript"> +<script type="text/javascript" language="javascript"> function submitRows(rowCount) { var rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "_rowCount"); @@ -30,7 +30,7 @@ under the License. <table width="100%" border="0" > - <form name="mostrecent" mode="POST" action="<@ofbizUrl>publishResponse</@ofbizUrl>"/> + <form name="mostrecent" mode="post" action="<@ofbizUrl>publishResponse</@ofbizUrl>"/> <#assign row=0/> <#list entityList as content> <@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId > @@ -43,7 +43,7 @@ under the License. </td> <td class="tabletext"> ${uiLabelMap.CommonSubmitted}: - <input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked/> + <input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked="checked" /> </td> <td class="tabletext"> ${uiLabelMap.CommonPublish}: Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl Sat Apr 10 13:50:12 2010 @@ -20,14 +20,14 @@ under the License. <script language="JavaScript" type="text/javascript"> function shipBillAddr() { <#if requestParameters.singleUsePayment?default("N") == "Y"> - <#assign singleUse = "&singleUsePayment=Y"> + <#assign singleUse = "&singleUsePayment=Y"> <#else> <#assign singleUse = ""> </#if> if (document.billsetupform.useShipAddr.checked) { - window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y${singleUse}"); + window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}&useShipAddr=Y${singleUse}"); } else { - window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}${singleUse}"); + window.location.replace("setBilling?createNew=Y&finalizeMode=payment&useGc=${requestParameters.useGc?if_exists}&paymentMethodType=${paymentMethodType?if_exists}${singleUse}"); } } </script> @@ -49,8 +49,8 @@ function shipBillAddr() { <#if paymentMethodType == "CC"> <#if creditCard?has_content && postalAddress?has_content> <form method="post" action="<@ofbizUrl>changeCreditCardAndBillingAddress</@ofbizUrl>" name="billsetupform"> - <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}"> - <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"> + <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}" /> + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}" /> <#elseif requestParameters.useShipAddr?exists> <form method="post" action="<@ofbizUrl>enterCreditCard</@ofbizUrl>" name="billsetupform"> <#else> @@ -60,8 +60,8 @@ function shipBillAddr() { <#if paymentMethodType == "EFT"> <#if eftAccount?has_content && postalAddress?has_content> <form method="post" action="<@ofbizUrl>changeEftAccountAndBillingAddress</@ofbizUrl>" name="billsetupform"> - <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"> - <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"> + <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}" /> + <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}" /> <#elseif requestParameters.useShipAddr?exists> <form method="post" action="<@ofbizUrl>enterEftAccount</@ofbizUrl>" name="billsetupform"> <#else> @@ -73,24 +73,24 @@ function shipBillAddr() { </#if> <#if requestParameters.singleUsePayment?default("N") == "Y"> - <input type="hidden" name="singleUsePayment" value="Y"> - <input type="hidden" name="appendPayment" value="Y"> + <input type="hidden" name="singleUsePayment" value="Y" /> + <input type="hidden" name="appendPayment" value="Y" /> </#if> - <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"> - <input type="hidden" name="partyId" value="${partyId}"> - <input type="hidden" name="paymentMethodType" value="${paymentMethodType}"> - <input type="hidden" name="finalizeMode" value="payment"> - <input type="hidden" name="createNew" value="Y"> + <input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS" /> + <input type="hidden" name="partyId" value="${partyId}" /> + <input type="hidden" name="paymentMethodType" value="${paymentMethodType}" /> + <input type="hidden" name="finalizeMode" value="payment" /> + <input type="hidden" name="createNew" value="Y" /> <#if requestParameters.useShipAddr?exists> - <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}"> + <input type="hidden" name="contactMechId" value="${postalFields.contactMechId}" /> </#if> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if cart.getShippingContactMechId()?exists && paymentMethodType != "GC"> <tr> <td width="26%" align="right"= valign="top"> - <input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked</#if>> + <input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked</#if> /> </td> <td colspan="2" valign="center"> <div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div> @@ -144,28 +144,28 @@ function shipBillAddr() { <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}" /> </td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"> + <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}" /> *</td> </tr> <tr> @@ -184,14 +184,14 @@ function shipBillAddr() { <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"> + <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}" /> </td> </tr> </#if> @@ -199,7 +199,7 @@ function shipBillAddr() { <#-- gift card fields --> <#if requestParameters.useGc?default("") == "GC" || paymentMethodType == "GC"> <#assign giftCard = requestParameters> - <input type="hidden" name="addGiftCard" value="Y"> + <input type="hidden" name="addGiftCard" value="Y" /> <#if paymentMethodType != "GC"> <tr> <td colspan="3"><hr /></td> @@ -214,21 +214,21 @@ function shipBillAddr() { <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"> + <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"> + <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}" /> *</td> </tr> <tr> <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"> + <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}" /> </td> </tr> <#if paymentMethodType != "GC"> @@ -236,7 +236,7 @@ function shipBillAddr() { <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"> + <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}" /> *</td> </tr> </#if> @@ -244,46 +244,46 @@ function shipBillAddr() { <tr> <td align="center" colspan="3"> - <input type="submit" class="smallsubmit" value="Continue"> + <input type="submit" class="smallsubmit" value="Continue" /> </td> </tr> </table> <#else> <#-- initial screen show a list of options --> <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="billsetupform"> - <input type="hidden" name="finalizeMode" value="payment"> - <input type="hidden" name="createNew" value="Y"> + <input type="hidden" name="finalizeMode" value="payment" /> + <input type="hidden" name="createNew" value="Y" /> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> <tr> - <td width='5%' nowrap><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?exists && paymentMethodType == "GC">checked</#if></td> - <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td> + <td width='5%' nowrap="nowrap"><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?exists && paymentMethodType == "GC">checked="checked"</#if> /></td> + <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists> <tr> - <td width='5%' nowrap><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?exists && paymentMethodType == "offline">checked</#if></td> - <td width='95%'nowrap><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?exists && paymentMethodType == "offline">checked="checked"</#if> /></td> + <td width='95%'nowrap="nowrap"><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists> <tr> - <td width='5%' nowrap><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?exists && paymentMethodType == "CC">checked</#if></td> - <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?exists && paymentMethodType == "CC">checked="checked"</#if> /></td> + <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td> </tr> <tr><td colspan="2"><hr /></td></tr> </#if> <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists> <tr> - <td width='5%' nowrap><input type="radio" name="paymentMethodType" value="EFT" <#if paymentMethodType?exists && paymentMethodType == "EFT">checked</#if></td> - <td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td> + <td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="EFT" <#if paymentMethodType?exists && paymentMethodType == "EFT">checked="checked"</#if> /></td> + <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td> </tr> </#if> <tr> <td align="center" colspan="2"> - <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}"> + <input type="submit" class="smallsubmit" value="${uiLabelMap.CommonContinue}" /> </td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=932719&r1=932718&r2=932719&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Sat Apr 10 13:50:12 2010 @@ -36,7 +36,7 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "EC") { // edit credit card - form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } else if (mode == "GC") { // edit gift card @@ -48,11 +48,11 @@ function submitForm(form, mode, value) { form.submit(); } else if (mode == "EE") { // edit eft account - form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); }else if(mode = "EG") //edit gift card - form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; + form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>"; form.submit(); } //]]> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |