From cfd3f6d9ea2346f68d426eb4ced139fa4b43f0c2 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 22 Dec 2011 10:27:18 +0000
Subject: [PATCH] // Changes to product page confirm messages

---
 admin-dev/themes/template/products/associations.tpl | 2 +-
 admin-dev/themes/template/products/combinations.tpl | 8 ++++----
 admin-dev/themes/template/products/features.tpl     | 4 ----
 admin-dev/themes/template/products/form.tpl         | 8 +++++++-
 admin-dev/themes/template/products/prices.tpl       | 2 +-
 admin-dev/themes/template/products/quantities.tpl   | 6 ++----
 admin-dev/themes/template/products/suppliers.tpl    | 3 +--
 admin-dev/themes/template/products/warehouses.tpl   | 4 +---
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/admin-dev/themes/template/products/associations.tpl b/admin-dev/themes/template/products/associations.tpl
index 6848d1913..555f9ff42 100644
--- a/admin-dev/themes/template/products/associations.tpl
+++ b/admin-dev/themes/template/products/associations.tpl
@@ -113,7 +113,7 @@
 		{/if}
 		<option disabled="disabled">----------</option>
 		</select>&nbsp;&nbsp;&nbsp;
-		<a href="{$link->getAdminLink('AdminManufacturers')}&addmanufacturer" onclick="return confirm('{l s='Are you sure you want to delete product information entered?' js=1} ')">
+		<a href="{$link->getAdminLink('AdminManufacturers')}&addmanufacturer" class="confirm_leave">
 		<img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> <b>{l s='Create'}</b>
 		</a>
 		</td>
diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index 4aecce82d..f48221ecc 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -70,7 +70,7 @@
 	</script>
 	<h4>{l s='Add or modify combinations for this product'}</h4>
 	<div class="separation"></div> {l s='or go to'}
-			&nbsp;<a class="button bt-icon" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}" onclick="return confirm('{l s='Are you sure you want to delete entered product information?'}');"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
+		&nbsp;<a class="button bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
 	<div class="separation"></div>
 	
 	<div id="add_new_combination" style="display: none;">
@@ -83,7 +83,7 @@
 					<select name="attribute_group" id="attribute_group" style="width: 200px;" onchange="populate_attrs();">
 						{if isset($attributes_groups)}
 							{foreach from=$attributes_groups key=k item=attribute_group}
-										<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|htmlentitiesUTF8}&nbsp;&nbsp;</option>
+								<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|htmlentitiesUTF8}&nbsp;&nbsp;</option>
 							{/foreach}
 						{/if}
 					</select>
@@ -143,11 +143,11 @@
 						<div id="upload-confirmation2">
 				
 							<p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$product->productDownload->getHtmlLink(false, true)}
-									<a id="make_downloadable_product_attribute" onclick="return confirm('{l s='Delete this file'}')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
+									<a id="make_downloadable_product_attribute" onclick="return confirm('{l s='Delete this file' js=1}')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
 							</p>
 						
 						</div>
-						<a id="delete_downloadable_product_attribute" style="display:none;" onclick="return confirm('{l s='Delete this file'}')" href="index.php?tab=AdminProducts&id_product={$product->id}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
+						<a id="delete_downloadable_product_attribute" style="display:none;" onclick="return confirm('{l s='Delete this file' js=1}')" href="index.php?tab=AdminProducts&id_product={$product->id}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a>
 						{if $up_filename}
 							<input type="hidden" id="virtual_product_filename_attribute" name="virtual_product_filename_attribute" value="{$up_filename}" />
 						{/if}
diff --git a/admin-dev/themes/template/products/features.tpl b/admin-dev/themes/template/products/features.tpl
index 6c7254345..63e0f69a2 100644
--- a/admin-dev/themes/template/products/features.tpl
+++ b/admin-dev/themes/template/products/features.tpl
@@ -32,10 +32,6 @@
 			code = (e.keyCode ? e.keyCode : e.which);
 			return (code == 13) ? false : true;
 		});
-
-		$('.confirm_leave').bind('click', function(){
-			return confirm('{l s='You will lose all unsaved modifications, do you want to proceed?' js=1}');
-		});
 	});
 
 </script>
diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl
index 2a0f49f5f..0fae487ba 100644
--- a/admin-dev/themes/template/products/form.tpl
+++ b/admin-dev/themes/template/products/form.tpl
@@ -77,7 +77,8 @@
 	<script type="text/javascript">
 		var toload = new Array();
 		var tabs_preloaded = new Array();
-		$(document).ready(function(){
+		$(document).ready(function()
+		{
 			{foreach $tabs_preloaded as $k => $tab}
 				tabs_preloaded['{$k}'] = '{$tab}';
 			{/foreach}
@@ -208,6 +209,11 @@
 				$("div.productTabs a[id$=-{$show_product_tab_content}]").click();
 			{/if}
 
+			$('.confirm_leave').live('click', function(){
+				// Double quotes are necessary when the translated string has single quotes
+				return confirm("{l s='You will lose all unsaved modifications, do you want to proceed?' js=1}");
+			});
+
 		});
 	</script>
 	
diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index c3b0078d3..3fff1a334 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -177,7 +177,7 @@ jQuery(document).ready(Customer.init);
 						</option>
 					{/foreach}
 					</select>
-					<a href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" onclick="return confirm('{l s='Are you sure you want to delete entered product information?'}'" >
+					<a href="{$link->getAdminLink('AdminTaxRulesGroup')}&addtax_rules_group&id_product={$product->id}" class="confirm_leave">
 					<img src="../img/admin/add.gif" alt="{l s='Create'}" title="{l s='Create'}" /> <b>{l s='Create'}</b>
 					</a>
 				</span>
diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl
index bc095df29..332fc81c6 100644
--- a/admin-dev/themes/template/products/quantities.tpl
+++ b/admin-dev/themes/template/products/quantities.tpl
@@ -125,10 +125,8 @@
 										<label id="label_out_of_stock_3" class="t" for="out_of_stock_3">
 											Default:
 											<i>Deny orders</i>
-											{assign var=confirm value="Are you sure you want to delete entered product information?"}
-											<a onclick="return confirm(' {$confirm} ');"
-												href="index.php?tab=AdminPPreferences&token={$token_preferences}">
-													{l s='as set in Preferences'}
+											<a class="confirm_leave" href="index.php?tab=AdminPPreferences&token={$token_preferences}">
+												{l s='as set in Preferences'}
 											</a>
 										</label>
 									</td>
diff --git a/admin-dev/themes/template/products/suppliers.tpl b/admin-dev/themes/template/products/suppliers.tpl
index f8f13775b..d4db5e6b8 100644
--- a/admin-dev/themes/template/products/suppliers.tpl
+++ b/admin-dev/themes/template/products/suppliers.tpl
@@ -47,8 +47,7 @@
 		<p>{l s='When using the advanced stock management (see Preferences/Products), the values you fill here (prices, references) will be used in the supply orders.'}</p>
 	</div>
 	<p>{l s='Please choose the suppliers associated to this product, and the default one.'}</p>
-	{assign var=confirm value="Are you sure you want to delete entered product information?"}
-	<a class="button bt-icon" href="{$link->getAdminLink('AdminSuppliers')}&addsupplier" onclick="return confirm(' {$confirm} ')">
+	<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')}&addsupplier">
 		<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span>
 	</a>
 	<table cellpadding="5" style="width:100%">
diff --git a/admin-dev/themes/template/products/warehouses.tpl b/admin-dev/themes/template/products/warehouses.tpl
index 079ea3a8e..1ee165a57 100644
--- a/admin-dev/themes/template/products/warehouses.tpl
+++ b/admin-dev/themes/template/products/warehouses.tpl
@@ -46,9 +46,7 @@
 	</div>
 	<p>{l s='Please choose the warehouses associated to this product, and the default one.'}</p>
 
-	{assign var=confirm value="Are you sure you want to delete entered product information?"}
-
-	<a class="button bt-icon" href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse" onclick="return confirm(' {$confirm} ')">
+	<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse">
 		<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span>
 	</a>