Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts: admin-dev/themes/default/css/modules.css admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl admin-dev/themes/default/template/controllers/products/images.tpl admin-dev/themes/default/template/controllers/products/prices.tpl admin-dev/themes/default/template/helpers/form/form.tpl admin-dev/themes/default/template/helpers/list/list_header.tpl classes/Autoload.php classes/Carrier.php classes/Product.php classes/ProductSale.php classes/Tools.php classes/Validate.php classes/tax/TaxRulesTaxManager.php controllers/admin/AdminPPreferencesController.php controllers/admin/AdminPerformanceController.php install-dev/install_version.php js/admin_carrier_wizard.js modules/blockcategories/blockcategories.php modules/blocklayered/blocklayered.php modules/statsequipment/statsequipment.php modules/statsproduct/statsproduct.php modules/watermark/watermark.php themes/default/address.tpl themes/default/authentication.tpl themes/default/category.tpl themes/default/contact-form.tpl themes/default/css/history.css themes/default/header.tpl themes/default/js/cart-summary.js themes/default/js/product.js themes/default/mobile/order-detail.tpl themes/default/modules/blocksearch/blocksearch.tpl themes/default/modules/productcomments/productcomments.tpl themes/default/order-carrier.tpl themes/default/order-detail.tpl themes/default/order-opc-new-account.tpl themes/default/product.tpl
2013-11-21 17:43:51 +01:00
parent 6431f559d7 d6e52bdecb
commit 9eefcfd058
167 changed files with 7261 additions and 861 deletions
@@ -102,8 +102,7 @@
 					}
 					else
 					{
-						$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}'+jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');" class="btn btn-default"><i class="icon-trash"></i> {l s='Delete'}</a></td></tr>');
-						
+						$('#group_discount_category_table').append('<tr class="alt_row" id="'+jsonData.id_category+'"><td>'+jsonData.catPath+'</td><td>{l s='Discount:'}' + ' ' + jsonData.discount+'{l s='%'}</td><td><a href="#" onclick="deleteCategoryReduction('+jsonData.id_category+');" class="btn btn-default"><i class="icon-trash"></i> {l s='Delete'}</a></td></tr>');
 						var input_hidden = document.createElement("input");
 						input_hidden.setAttribute('type', 'hidden');
 						input_hidden.setAttribute('value', jsonData.discount);
@@ -132,7 +131,7 @@
 				{foreach $input['values'] key=key item=category }
 					<tr class="alt_row" id="{$category.id_category}">
 						<td>{$category.path}</td>
-						<td>{l s='Discount: %d%%' sprintf=$category.reduction}</td>
+						<td>{l s='Discount: %.2f%%' sprintf=$category.reduction}</td>
 						<td>
 							<a href="#" onclick="deleteCategoryReduction({$category.id_category});"class="btn btn-default">
 								<i class="icon-trash"></i> {l s='Delete'}
@@ -216,4 +215,4 @@
 	{else}
 		{$smarty.block.parent}
 	{/if}
-{/block}
+{/block}
@@ -34,7 +34,7 @@
 			<div class="form-horizontal">
 				<div class="form-group">
 					<label class="col-lg-3 control-label">{l s='Discount:'}</label>
-					<div class="col-lg-3"><p class="form-control-static">{l s='%d%%' sprintf=$group->reduction}</p></div>
+					<div class="col-lg-3"><p class="form-control-static">{l s='Discount: %.2f%%' sprintf=$group->reduction}</p></div>
 				</div>
 				<div class="form-group">
 					<label class="col-lg-3 control-label">{l s='Price display method:'}</label>
@@ -53,7 +53,7 @@
 	</div>
 	<div class="col-lg-6">
 		<div class="panel">
-			<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>	
+			<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>
 			{if !$categorieReductions}
 				<div class="alert alert-warning">{l s='None'}</div>
 			{else}
@@ -68,7 +68,7 @@
 					{foreach $categorieReductions key=key item=category }
 						<tr class="alt_row">
 							<td>{$category.path}</td>
-							<td>{l s='%d%%' sprintf=$category.reduction}</td>
+							<td>{l s='Discount: %.2f%%' sprintf=$category.reduction}</td>
 						</tr>
 					{/foreach}
 					<tbody>
@@ -84,4 +84,4 @@
 		{$customerList}
 	</div>
 </div>
-{/block}
+{/block}
@@ -75,7 +75,7 @@
 		});

 		// Method to check / uncheck all modules checkbox
-		$('#checkme').click(function()
+		$('#moduleContainer').on("click", "#checkme", function()
 		{
 			if ($(this).attr("rel") == 'false')
 			{
@@ -308,8 +308,8 @@
 			catch(e){}
 			return false;
 		});
-		
-		$('.toggle_favorite').live('click', function(event)
+
+		$('#moduleContainer').on("click", ".toggle_favorite", function()
 	    {
 	      var el = $(this);
 	      var value_pref = el.data('value');
@@ -71,7 +71,6 @@
 			{/foreach}
 			</div>
 		</div>
-
 		<script type="text/javascript">
 			var token = '{$token}';
 			var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
@@ -104,8 +103,6 @@
 			$(document).ready(function()
 			{
 				hideOtherLanguage(default_language);
-				
-				$('#product-tab-content-wait').show();

 				if (product_type == product_type_pack)
 				{
@@ -86,6 +86,7 @@
 	</div>
 </div>

+
 <table class="table tableDnD" id="imageTable">
 	<thead>
 		<tr class="nodrag nodrop"> 
@@ -105,6 +106,7 @@
 	</tbody>
 </table>

+
 <table id="lineType" style="display:none;">
 	<tr id="image_id">
 		<td>
@@ -284,7 +286,7 @@
 				"ajax" : 1 
 			});
 		});
-
+		
 		function updateImagePosition(json)
 		{
 			doAdminAjax(
@@ -305,7 +305,7 @@ $(document).ready(function () {
 	<script type="text/javascript">
 		var product_prices = new Array();
 		{foreach from=$combinations item='combination'}
-			product_prices['{$combination.id_product_attribute}'] = '{$combination.price}';
+			product_prices['{$combination.id_product_attribute}'] = '{$combination.price|@addcslashes:'\''}';
 		{/foreach}
 	</script>

@@ -58,7 +58,7 @@
 						$('#file_missing').hide();
 						$('#virtual_product_name').attr('value', fileName);
 						$("#upload-confirmation .error").remove();
-						$('#upload-confirmation div').find('span').remove()
+						$('#upload-confirmation div').find('span').remove();
 						$('#upload-confirmation div').prepend('<span>{l s='The file'}&nbsp;"<a class="link" href="get-file-admin.php?file='+msg+'&filename='+fileName+'">'+fileName+'</a>"&nbsp;{l s='has successfully been uploaded'}' +
 							'<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="' + msg + '" /></span>');
 						$("#upload-confirmation").show();
@@ -51,6 +51,7 @@
 					{/if}
 					class="{if !$no_link}pointer{/if}
 					{if isset($params.position) && $order_by == 'position'  && $order_way != 'DESC'} dragHandle{/if}
+					{if isset($params.class)} {$params.class}{/if}
 					{if isset($params.align)} {$params.align}{/if}"
 					{if (!isset($params.position) && !$no_link && !isset($params.remove_onclick))}
 						onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">
@@ -175,6 +175,7 @@
 			{/if}
 		</div>
 {/if}
+
 {if $simple_header}
 <div class="panel col-lg-12">
 	{if isset($title)}<h3>{if isset($icon)}<i class="{$icon}"></i> {/if}{if is_array($title)}{$title|end}{else}{$title}{/if}</h3>{/if}
@@ -247,7 +248,6 @@
 							--
 						{/if}
 					</th>
-
 					{* Filters (input, select, date or bool) *}
 					{foreach $fields_display AS $key => $params}
 					<th {if isset($params.align)} class="{$params.align}" {/if}>
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-<div class="toolbar-placeholder">
+<div id="{$table}_toolbar" class="toolbar-placeholder">
 	<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if}">
 		{block name=toolbarBox}
 			<ul class="cc_button">
@@ -52,7 +52,7 @@
 				var modules_list_loaded = false;
 				$(function() {
 					//get reference on save link
-					btn_save = $('span[class~="process-icon-save"]').parent();
+					btn_save = $('#{$table}_toolbar span[class~="process-icon-save"]').parent();

 					//get reference on form submit button
 					btn_submit = $('#{$table}_form_submit_btn');
@@ -89,6 +89,9 @@
 						//submit the form
 						{block name=formSubmit}
 							btn_save.click(function() {
+								// Vars
+								var btn_submit = $('#{$table}_form_submit_btn');
+
 								// Avoid double click
 								if (submited)
 									return false;