From 969a94c261d4c698ae97b5a6c4e4b8aa49bac2b4 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Mon, 24 Sep 2012 10:12:25 +0000
Subject: [PATCH] // Changed image system to new default (+customization)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17492 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../default/template/controllers/carts/helpers/view/view.tpl  | 4 ++--
 .../default/template/controllers/products/combinations.tpl    | 2 +-
 .../themes/default/template/controllers/products/images.tpl   | 2 +-
 controllers/admin/AdminProductsController.php                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
index 0a6c0c462..baa6a93f2 100755
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
@@ -99,7 +99,7 @@
 							<ul style="margin: 0; padding: 0; list-style-type: none;">
 							{foreach from=$datas key='index' item='data'}
 									<li style="display: inline; margin: 2px;">
-										<a href="displayImage.php?img={$data.value}&name={$order->id}-file{$smarty.foreach.count.index}" target="_blank">
+										<a href="displayImage.php?img={$data.value}&name={$order->id}-file{$index}" target="_blank">
 										<img src="{$pic_dir}{$data.value}_small" alt="" /></a>
 									</li>
 							{/foreach}
@@ -107,7 +107,7 @@
 						{elseif $type == constant('Product::CUSTOMIZE_TEXTFIELD')}
 							<ul style="margin-bottom: 4px; padding: 0; list-style-type: none;">
 							{foreach from=$datas key='index' item='data'}
-								<li>{if $data.name}{$data.name}{else}{l s='Text #'}{$smarty.foreach.count.index}{/if}{l s=':'}<b>{$data.value}</b></li>
+								<li>{if $data.name}{$data.name}{else}{l s='Text #'}{$index}{/if}{l s=':'}<b>{$data.value}</b></li>
 							{/foreach}
 							</ul>
 						{/if}
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index b4b58ff63..4640b42ae 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -253,7 +253,7 @@
 							<li style="float: left; width: {$imageWidth}px;">
 								<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
 								<label for="id_image_attr_{$image.id_image}" style="float: none;">
-									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
+									<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-small_default.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
 								</label>
 							</li>
 						{/foreach}
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index ad7aa79ff..615f10329 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -79,7 +79,7 @@
 		<tr id="image_id">
 			<td style="padding: 4px;">
 				<a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox">
-					<img src="{$smarty.const._THEME_PROD_DIR_}en-default-small.jpg" alt="image_id" title="image_id" />
+					<img src="{$smarty.const._THEME_PROD_DIR_}en-default-small_default.jpg" alt="image_id" title="image_id" />
 				</a>
 			</td>
 			<td id="td_image_id" class="pointer dragHandle center positionImage">
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 04ed89629..331e103f8 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3342,7 +3342,7 @@ class AdminProductsControllerCore extends AdminController
 		$images = Image::getImages($this->context->language->id, $product->id);
 
 		foreach ($images as $k => $image)
-			$images[$k]['src'] = $this->context->link->getImageLink($product->link_rewrite[$this->context->language->id], $product->id.'-'.$image['id_image'], 'small');
+			$images[$k]['src'] = $this->context->link->getImageLink($product->link_rewrite[$this->context->language->id], $product->id.'-'.$image['id_image'], 'small_default');
 		$data->assign('images', $images);
 		$data->assign('imagesTypes', ImageType::getImagesTypes('products'));
 
@@ -3513,7 +3513,7 @@ class AdminProductsControllerCore extends AdminController
 					$data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities(Tools::displayDate($this->getFieldValue($product, 'available_date'), $this->context->language->id))) : '0000-00-00');
 
 					$i = 0;
-					$data->assign('imageType', ImageType::getByNameNType('small', 'products'));
+					$data->assign('imageType', ImageType::getByNameNType('small_default', 'products'));
 					$data->assign('imageWidth', (isset($image_type['width']) ? (int)($image_type['width']) : 64) + 25);
 					foreach ($images as $k => $image)
 					{