Index: specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (working copy) @@ -83,7 +83,7 @@ } function addItem() { if (document.addform.add_product_id.value == 'NULL') { - alert("Please select all of the required options."); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonPleaseSelectAllRequiredOptions}"); return; } else { if (isVirtual(document.addform.add_product_id.value)) { @@ -113,7 +113,7 @@ if (detailImageUrl == "_NONE_") { hack = document.createElement('span'); hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; - alert(hack.innerHTML); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"); return; } detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/"); @@ -196,23 +196,27 @@ msg[0]="Please use correct date format [yyyy-mm-dd]"; var y=x.split("-"); - if(y.length!=3){ alert(msg[0]);return false; } - if((y[2].length>2)||(parseInt(y[2])>31)) { alert(msg[0]); return false; } + if(y.length!=3){ showAlert(msg[0]);return false; } + if((y[2].length>2)||(parseInt(y[2])>31)) { showAlert(msg[0]); return false; } if(y[2].length==1){ y[2]="0"+y[2]; } - if((y[1].length>2)||(parseInt(y[1])>12)){ alert(msg[0]); return false; } + if((y[1].length>2)||(parseInt(y[1])>12)){ showAlert(msg[0]); return false; } if(y[1].length==1){ y[1]="0"+y[1]; } - if(y[0].length>4){ alert(msg[0]); return false; } + if(y[0].length>4){ showAlert(msg[0]); return false; } if(y[0].length<4) { if(y[0].length==2) { y[0]="20"+y[0]; } else { - alert(msg[0]); + showAlert(msg[0]); return false; } } return (y[0]+"-"+y[1]+"-"+y[2]); } + function showAlert(msg){ + showErrorAlert("${uiLabelMap.CommonErrorMessage2}", msg); + } + function additemSubmit(){ <#if product.productTypeId?if_exists == "ASSET_USAGE"> newdatevalue = validate(document.addform.reservStart.value); @@ -577,7 +581,7 @@
${uiLabelMap.CommonQuantity}:  - ${uiLabelMap.OrderAddToCart} + ${uiLabelMap.OrderAddToCart}  
Index: specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (working copy) @@ -69,7 +69,7 @@ if (detailImageUrl == "_NONE_") { hack = document.createElement('span'); hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; - alert(hack.innerHTML); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"); return; } detailImageUrl = detailImageUrl.replace(/\&\#47;/g, "/"); @@ -468,7 +468,7 @@
${question.description?if_exists}
<#assign instructions = question.content.get("INSTRUCTIONS")?if_exists> <#if instructions?has_content> - Instructions + Instructions <#assign image = question.content.get("IMAGE_URL")?if_exists> <#if image?string?has_content> Index: specialpurpose/ecommerce/webapp/ecommerce/images/profile.js =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (working copy) @@ -185,13 +185,14 @@ if (data._ERROR_MESSAGE_LIST_ != undefined) { serverErrorHash = data._ERROR_MESSAGE_LIST_; - alert(serverErrorHash); + var CommonErrorMessage2 = getJSONuiLabel("CommonUiLabels", "CommonErrorMessage2"); + showErrorAlert(CommonErrorMessage2, serverErrorHash); jQuery.each(serverErrorHash, function(error, message){ if (error != undefined) { serverError += message; } }); - + if (serverError == "") { serverError = serverErrorHash; } Index: specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl (working copy) @@ -28,7 +28,7 @@ document.${parameters.formNameValue}.processButton.disabled=true; document.${parameters.formNameValue}.submit(); } else { - alert("You order is being processed, this may take a moment."); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.YoureOrderIsBeingProcessed}"); } } // --> Index: specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (working copy) @@ -28,7 +28,7 @@ document.${parameters.formNameValue}.processButton.disabled=true; document.${parameters.formNameValue}.submit(); } else { - alert("You order is being processed, this may take a moment."); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.YoureOrderIsBeingProcessed}"); } } Index: specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl =================================================================== --- specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (revision 1055374) +++ specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (working copy) @@ -85,7 +85,7 @@ } } if (cartSize > passed && selectedValue != "NO^") { - alert("${uiLabelMap.EcommerceSelectedGiftWrap}"); + showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.EcommerceSelectedGiftWrap}"); } cform.submit(); } Index: framework/example/widget/example/FormWidgetExampleForms.xml =================================================================== --- framework/example/widget/example/FormWidgetExampleForms.xml (revision 1055374) +++ framework/example/widget/example/FormWidgetExampleForms.xml (working copy) @@ -161,7 +161,7 @@