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 @@
#if>
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
#if>
<#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 @@
Index: framework/common/webcommon/includes/geolocation.ftl
===================================================================
--- framework/common/webcommon/includes/geolocation.ftl (revision 1055374)
+++ framework/common/webcommon/includes/geolocation.ftl (working copy)
@@ -81,7 +81,7 @@
var geocoder = new GClientGeocoder();
var map = new GMap2(document.getElementById("<#if geoChart.id?has_content>${geoChart.id}<#else>map_canvas#if>"));
geocoder.getLatLng("${pointAddress}", function(point) {
- if (!point) { alert("Address not found");}
+ if (!point) { showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonAddressNotFound}");}
map.setUIToDefault();
map.setCenter(point, 13);
map.addOverlay(new GMarker(point));
Index: framework/images/webapp/images/fieldlookup.js
===================================================================
--- framework/images/webapp/images/fieldlookup.js (revision 1055374)
+++ framework/images/webapp/images/fieldlookup.js (working copy)
@@ -125,18 +125,19 @@
}
}
}
-
+
var obj_lookupwindow = window.open(getViewNameWithSeparator(view_name) + 'presentation=' + this.presentation + '&id=' + this.id + argString, '_blank', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top=' + my + ',left=' + mx + ',dependent=yes,alwaysRaised=yes');
obj_lookupwindow.opener = window;
obj_lookupwindow.focus();
}
function lookup_error(str_message) {
- alert(str_message);
+ var CommonErrorMessage2 = getJSONuiLabel("CommonUiLabels", "CommonErrorMessage2");
+ showErrorAlert(CommonErrorMessage2, str_message);
return null;
}
function getViewNameWithSeparator(view_name) {
- var sep = "?";
+ var sep = "?";
if (view_name.indexOf("?") >= 0) {
sep = "&";
}
Index: applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (revision 1055374)
+++ applications/order/webapp/ordermgr/entry/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
#if>
<#assign image = question.content.get("IMAGE_URL")?if_exists>
<#if image?has_content>
Index: applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (revision 1055374)
+++ applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (working copy)
@@ -82,7 +82,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)) {
@@ -107,7 +107,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, "/");
@@ -190,23 +190,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);
@@ -456,7 +460,7 @@
#if>
Index: applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (revision 1055374)
+++ applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (working copy)
@@ -37,7 +37,7 @@
if (window[fieldName] == "_NONE_") {
hack = document.createElement('span');
hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}";
- alert(hack.innerHTML);
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonNoDetailImageAvailableToDisplay}");
return;
}
window[fieldName] = window[fieldName].replace(/\&\#47;/g, "/");
@@ -163,7 +163,7 @@
if (element.name.substring(0, index) == fieldName) {
if (element.value == '' || element.value == 'NULL') {
option.checked = false;
- alert('Please select all features first');
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonPleaseSelectAllFeaturesFirst}");
return false;
}
}
Index: applications/order/webapp/ordermgr/entry/cart/javascript.ftl
===================================================================
--- applications/order/webapp/ordermgr/entry/cart/javascript.ftl (revision 1055374)
+++ applications/order/webapp/ordermgr/entry/cart/javascript.ftl (working copy)
@@ -84,7 +84,7 @@
}
}
if (cartSize > passed && selectedValue != "NO^") {
- alert("${uiLabelMap.OrderSelectedGiftNotAvailableForAll}");
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.OrderSelectedGiftNotAvailableForAll}");
}
cform.submit();
}
Index: applications/party/webapp/partymgr/js/PartyProfileContent.js
===================================================================
--- applications/party/webapp/partymgr/js/PartyProfileContent.js (revision 1055374)
+++ applications/party/webapp/partymgr/js/PartyProfileContent.js (working copy)
@@ -18,13 +18,21 @@
* */
/**
- *
+ *
**/
+var uiLabelJsonObject = null;
jQuery(document).ready(function() {
+
+ var labelObject = {
+ "CommonUiLabels" : ["CommonUpload", "CommonSave", "CommonCompleted"],
+ };
+
+ uiLabelJsonObjects = getJSONuiLabels(labelObject);
+
jQuery("#uploadPartyContent").bind("submit", uploadPartyContent);
jQuery("#uploadPartyContent").bind("submit", getUploadProgressStatus);
jQuery("#progress_bar").progressbar({value: 0});
-
+
});
function uploadPartyContent(event){
@@ -42,17 +50,17 @@
function uploadCompleted(){
var iframePartyContentList = jQuery("#target_upload").contents().find("#partyContentList").html();
-
+
// update partyContentList - copy the Data from the iFrame partyContentList to the page partyContentList
jQuery("#partyContentList").html(iframePartyContentList);
-
- jQuery('#progressBarSavingMsg').html("Saving complete!");
+
+ jQuery('#progressBarSavingMsg').html(uiLabelJsonObjects.CommonUiLabels[2]);
// reset progressbar
jQuery("#progress_bar").progressbar("option", "value", 0);
-
+
// remove iFrame
jQuery("#target_upload").remove();
- return;
+ return;
}
function checkIframeStatus() {
@@ -73,7 +81,7 @@
}
function getUploadProgressStatus(event){
- jQuery('#uploadPartyContent').append("Uploading...");
+ jQuery('#uploadPartyContent').append("" + uiLabelJsonObjects.CommonUiLabels[0] + "...");
var i=0;
jQuery.fjTimer({
interval: 1000,
@@ -93,9 +101,9 @@
} else {
var readPercent = data.readPercent;
jQuery("#progress_bar").progressbar("option", "value", readPercent);
- jQuery('#progressBarSavingMsg').html("Uploading... (" + readPercent + "%)");
+ jQuery('#progressBarSavingMsg').html(uiLabelJsonObjects.CommonUiLabels[0] + "... (" + readPercent + "%)");
if(readPercent > 99){
- jQuery('#progressBarSavingMsg').html("Saving...");
+ jQuery('#progressBarSavingMsg').html(uiLabelJsonObjects.CommonUiLabels[1] + "...");
// stop the fjTimer
timerId.stop();
// call the upload complete method to do final stuff
Index: applications/content/data/TemplateData.xml
===================================================================
--- applications/content/data/TemplateData.xml (revision 1055374)
+++ applications/content/data/TemplateData.xml (working copy)
@@ -146,7 +146,7 @@
<#if autoUserLogin?has_content>document.loginform.PASSWORD.focus();#if>
<#if !autoUserLogin?has_content>document.loginform.USERNAME.focus();#if>
function requery() {
- alert("REQUERY" + document.sectionform.sectionId.value);
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}", "${uiLabelMap.CommonRequery}: " + document.sectionform.sectionId.value));
}
]]>
Index: applications/content/webapp/content/content/ContentNav.ftl
===================================================================
--- applications/content/webapp/content/content/ContentNav.ftl (revision 1055374)
+++ applications/content/webapp/content/content/ContentNav.ftl (working copy)
@@ -122,7 +122,7 @@
type: 'POST',
data: {"contentId" : contentId},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -137,7 +137,7 @@
data: {contentId: contentId,
contentAssocTypeId: 'TREE_CHILD'},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -151,7 +151,7 @@
type: 'POST',
data: {contentId: contentId},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -165,7 +165,7 @@
type: 'POST',
data: {contentIdTo: contentIdTo},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -180,7 +180,7 @@
type: 'POST',
data: {contentId : contentId, contentIdTo : contentIdTo, contentAssocTypeId : contentAssocTypeId, fromDate : fromDate},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
location.reload();
@@ -197,7 +197,7 @@
rename: 'Y'
},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -211,7 +211,7 @@
url: url,
type: 'POST',
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
Index: applications/content/webapp/content/content/nav.ftl
===================================================================
--- applications/content/webapp/content/content/nav.ftl (revision 1055374)
+++ applications/content/webapp/content/content/nav.ftl (working copy)
@@ -77,7 +77,7 @@
type: 'POST',
data: {"dataCategoryId" : dataCategoryId},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#cmscontent').html(msg);
Index: applications/content/webapp/content/content/DisplayContentNav.ftl
===================================================================
--- applications/content/webapp/content/content/DisplayContentNav.ftl (revision 1055374)
+++ applications/content/webapp/content/content/DisplayContentNav.ftl (working copy)
@@ -124,7 +124,7 @@
type: 'POST',
data: {"contentId" : contentId},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -139,7 +139,7 @@
data: { contentId: contentId,
contentAssocTypeId: 'TREE_CHILD'},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -153,7 +153,7 @@
type: 'POST',
data: {contentId: contentId},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -167,7 +167,7 @@
type: 'POST',
data: {contentIdTo: contentIdTo},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -182,7 +182,7 @@
type: 'POST',
data: {contentId : contentId, contentIdTo : contentIdTo, contentAssocTypeId : contentAssocTypeId, fromDate : fromDate},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
location.reload();
@@ -199,7 +199,7 @@
rename: 'Y'
},
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
@@ -213,7 +213,7 @@
url: url,
type: 'POST',
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#Document').html(msg);
Index: applications/content/webapp/content/website/WebSiteCMSContent.ftl
===================================================================
--- applications/content/webapp/content/website/WebSiteCMSContent.ftl (revision 1055374)
+++ applications/content/webapp/content/website/WebSiteCMSContent.ftl (working copy)
@@ -50,7 +50,7 @@
if (form != null) {
ajaxSubmitForm(form, "<#if content?has_content>${content.contentId!}#if>");
} else {
- alert("Cannot find the cmsform!");
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CannotFindCmsform}");
}
return false;
Index: applications/content/webapp/content/website/WebSiteCMSNav.ftl
===================================================================
--- applications/content/webapp/content/website/WebSiteCMSNav.ftl (revision 1055374)
+++ applications/content/webapp/content/website/WebSiteCMSNav.ftl (working copy)
@@ -344,7 +344,7 @@
type: 'POST',
data: ctx,
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#cmscontent').html(msg);
@@ -378,7 +378,7 @@
type: 'POST',
data: ctx,
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#cmscontent').html(msg);
@@ -399,7 +399,7 @@
type: 'POST',
data: ctx,
error: function(msg) {
- alert("An error occured loading content! : " + msg);
+ showErrorAlert("${uiLabelMap.ErrorLoadingContent}","${uiLabelMap.ErrorLoadingContent} : " + msg);
},
success: function(msg) {
jQuery('#cmscontent').html(msg);
@@ -436,7 +436,7 @@
type: 'POST',
data: jQuery(form).serialize(),
error: function(msg) {
- alert("An error occurred.");
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonUnspecifiedErrorOccurred}");
},
success: function(msg) {
callPathAlias(contentId);
@@ -454,7 +454,7 @@
type: 'POST',
data: {"pathAlias" : pathAlias, "webSiteId" : webSiteId},
error: function(msg) {
- alert("An error occured! : " + msg);
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonUnspecifiedErrorOccurred} : " + msg);
},
success: function(msg) {
callPathAlias(contentId);
@@ -478,7 +478,7 @@
}
},
error: function(msg) {
- alert("An error occurred submitting form.");
+ showErrorAlert("${uiLabelMap.CommonErrorMessage2}","${uiLabelMap.CommonErrorSubmittingForm} : " + msg);
}
});
}
Index: applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
===================================================================
--- applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (revision 1055374)
+++ applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (working copy)
@@ -56,18 +56,18 @@
<#elseif ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?exists>
<#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderProductNotFound?interpret><@uiLabelWithVar/>
-
+
<#elseif ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?exists>
<#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityExceedsAvailableToReceive?interpret><@uiLabelWithVar/>
-
+
#if>
<#if ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?exists>
<#assign uiLabelWithVar=uiLabelMap.ProductReceiveInventoryAgainstPurchaseOrderQuantityGoesToBackOrder?interpret><@uiLabelWithVar/>
-
+
#if>
#if>