// fix adminproducts images, layout-ajax improvements

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10591 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/template/layout-ajax.tpl

@@ -25,12 +25,12 @@
 *}
 {if isset($json)}
 {
-	status:{$status},
-	conf:{$json},
-	informations:{$informations},
-	error:{$errors},
-	warnings:{$warnings},
-	content:{$page}
+	"status":"{$status}",
+	"confirmations" : {$confirmations},
+	"informations" : {$informations},
+	"error" : {$errors},
+	"warnings" : {$warnings},
+	"content" : {$page}
 }
 {else}
 
@@ -67,8 +67,8 @@
 
 	{if isset($confirmations) && count($confirmations) && $confirmations}
 		<div class="conf" style="display:block;">
-			{foreach $confirmations as $conf}
-				{$conf}<br />
+			{foreach $confirmations as $confirm}
+				{$confirm}<br />
 			{/foreach}
 		</div><br />
 	{/if}

admin-dev/themes/template/products/form.tpl

@@ -41,7 +41,7 @@
 		<ul class="tab">
 		{foreach $product_tabs key=numStep item=tab}
 			<li class="tab-row">
-				<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}">{$tab.name}</a>{*todo href when nojs*}
+				<a class="tab-page {if $tab.selected}selected{/if}" id="link-{$tab.id}" href="{$tab.href}&amp;updateproduct">{$tab.name}</a>{*todo href when nojs*}
 			</li>
 		{/foreach}
 		</ul>
@@ -52,12 +52,18 @@
 function showSaveButtons()
 {
 	$('#desc-product-save').show();
+	$('#desc-product-cancel').show();
+	$('#desc-product-duplicate').show();
+	$('#desc-product-delete').show();
 	$('#desc-product-save-and-stay').show();
 }
 
 function hideSaveButtons()
 {
 	$('#desc-product-save').hide();
+	$('#desc-product-cancel').hide();
+	$('#desc-product-duplicate').hide();
+	$('#desc-product-delete').hide();
 	$('#desc-product-save-and-stay').hide();
 }
 

admin-dev/themes/template/products/images.tpl

@@ -230,17 +230,15 @@
 				$(this).attr("src", $(this).attr("src").replace("enabled", "forbbiden"));
 			});
 			$(this).attr("src", $(this).attr("src").replace("forbbiden", "enabled"));
-			$.ajax(
-			{
-				url : "ajax-tab.php",
-				data : {
+			doAdminAjax({
 				"action":"UpdateCover",
 				"id_image":id,
 				"id_product" : {/literal}{$id_product}{literal},
 				"token" : "{/literal}{$token}{literal}",
-				"tab" : "AdminProducts",
-				"ajax" : 1 },
-			});
+				"controller" : "AdminProducts",
+				"ajax" : 1 }
+			);
+			
 		});
 		
 		$('.image_shop').die().live('click', function()
@@ -250,32 +248,28 @@
 				active = true;
 			id = $(this).parent().parent().attr('id');
 			id_shop = $(this).attr("id").replace(id, "");
-			$.ajax(
+			doAdminAjax(
 			{
-				url : "ajax-tab.php",
-				data : {
 				"action":"UpdateProductImageShopAsso",
 				"id_image":id,
 				"id_shop": id_shop,
 				"active":active,
 				"token" : "{/literal}{$token}{literal}",
 				"tab" : "AdminProducts",
-				"ajax" : 1 },
+				"ajax" : 1 
 			});
 		});
 		
 		//function	
 		function updateImagePositon(json)
 		{
-			$.ajax(
-			{
-				url : "ajax-tab.php",
-				data : {
+			doAdminAjax(
+			 {
 				"action":"updateImagePosition",
 				"json":json,
 				"token" : "{/literal}{$token}{literal}",
 				"tab" : "AdminProducts",
-				"ajax" : 1 },
+				"ajax" : 1
 			});
 
 		}