// Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242

2012-09-21 14:59:51 +00:00
parent de29614c03
commit 4896b787f3
574 changed files with 60 additions and 60 deletions
@@ -41,7 +41,7 @@ class BestSalesControllerCore extends FrontController
 			'products' => ProductSale::getBestSales($this->context->language->id, $this->p - 1, $this->n, $this->orderBy, $this->orderWay),
 			'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
 			'nbProducts' => $nbProducts,
-			'homeSize' => Image::getSize('home')
+			'homeSize' => Image::getSize('home_default')
 		));

 		$this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl');
@@ -100,10 +100,10 @@ class CategoryControllerCore extends FrontController
 			'return_category_name' => Tools::safeOutput($this->category->name),
 			'path' => Tools::getPath($this->category->id),
 			'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
-			'categorySize' => Image::getSize('category'),
-			'mediumSize' => Image::getSize('medium'),
-			'thumbSceneSize' => Image::getSize('thumb_scene'),
-			'homeSize' => Image::getSize('home'),
+			'categorySize' => Image::getSize('category_default'),
+			'mediumSize' => Image::getSize('medium_default'),
+			'thumbSceneSize' => Image::getSize('m_scene_default'),
+			'homeSize' => Image::getSize('home_default'),
 			'allow_oosp' => (int)Configuration::get('PS_ORDER_OUT_OF_STOCK'),
 			'comparator_max_item' => (int)Configuration::get('PS_COMPARATOR_MAX_ITEM'),
 			'suppliers' => Supplier::getSuppliers()
@@ -127,9 +127,9 @@ class CategoryControllerCore extends FrontController
 		{
 			foreach ($sceneImageTypes as $sceneImageType)
 			{
-				if ($sceneImageType['name'] == 'thumb_scene')
+				if ($sceneImageType['name'] == 'm_scene_default')
 					$thumbSceneImageType = $sceneImageType;
-				elseif ($sceneImageType['name'] == 'large_scene')
+				elseif ($sceneImageType['name'] == 'scene_default')
 					$largeSceneImageType = $sceneImageType;
 			}

@@ -146,7 +146,7 @@ class CompareControllerCore extends FrontController
 						'product_features' => $listFeatures,
 						'products' => $listProducts,
 						'width' => $width,
-						'homeSize' => Image::getSize('home')
+						'homeSize' => Image::getSize('home_default')
 					));
 					$this->context->smarty->assign('HOOK_EXTRA_PRODUCT_COMPARISON', Hook::exec('displayProductComparison', array('list_ids_product' => $ids)));
 				}
@@ -117,7 +117,7 @@ class ManufacturerControllerCore extends FrontController
 			$this->context->smarty->assign(array(
 				'pages_nb' => ceil($nbProducts / (int)($this->n)),
 				'nbManufacturers' => $nbProducts,
-				'mediumSize' => Image::getSize('medium'),
+				'mediumSize' => Image::getSize('medium_default'),
 				'manufacturers' => $data,
 				'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
 			));
@@ -58,7 +58,7 @@ class NewProductsControllerCore extends FrontController
 			'products' => Product::getNewProducts($this->context->language->id, (int)($this->p) - 1, (int)($this->n), false, $this->orderBy, $this->orderWay),
 			'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
 			'nbProducts' => (int)($nbProducts),
-			'homeSize' => Image::getSize('home')
+			'homeSize' => Image::getSize('home_default')
 		));

 		$this->setTemplate(_PS_THEME_DIR_.'new-products.tpl');
@@ -51,7 +51,7 @@ class PricesDropControllerCore extends FrontController
 			'products' => Product::getPricesDrop($this->context->language->id, (int)$this->p - 1, (int)$this->n, false, $this->orderBy, $this->orderWay),
 			'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
 			'nbProducts' => $nbProducts,
-			'homeSize' => Image::getSize('home')
+			'homeSize' => Image::getSize('home_default')
 		));

 		$this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl');
@@ -322,14 +322,14 @@ class ProductControllerCore extends FrontController
 		}
 		if (!isset($cover))
 			$cover = array('id_image' => $this->context->language->iso_code.'-default', 'legend' => 'No picture', 'title' => 'No picture');
-		$size = Image::getSize('large');
+		$size = Image::getSize('large_default');
 		$this->context->smarty->assign(array(
 			'have_image' => Product::getCover((int)Tools::getValue('id_product')),
 			'cover' => $cover,
 			'imgWidth' => (int)$size['width'],
-			'mediumSize' => Image::getSize('medium'),
-			'largeSize' => Image::getSize('large'),
-			'homeSize' => Image::getSize('home'),
+			'mediumSize' => Image::getSize('medium_default'),
+			'largeSize' => Image::getSize('large_default'),
+			'homeSize' => Image::getSize('home_default'),
 			'col_img_dir' => _PS_COL_IMG_DIR_));
 		if (count($product_images))
 			$this->context->smarty->assign('images', $product_images);
@@ -82,7 +82,7 @@ class SearchControllerCore extends FrontController
 				'nbProducts' => $search['total'],
 				'search_query' => $query,
 				'instant_search' => $this->instant_search,
-				'homeSize' => Image::getSize('home')));
+				'homeSize' => Image::getSize('home_default')));
 		}
 		else if (($query = Tools::getValue('search_query', Tools::getValue('ref'))) && !is_array($query))
 		{
@@ -98,7 +98,7 @@ class SearchControllerCore extends FrontController
 				'search_products' => $search['result'],
 				'nbProducts' => $search['total'],
 				'search_query' => $query,
-				'homeSize' => Image::getSize('home')));
+				'homeSize' => Image::getSize('home_default')));
 		}
 		else if (($tag = urldecode(Tools::getValue('tag'))) && !is_array($tag))
 		{
@@ -111,7 +111,7 @@ class SearchControllerCore extends FrontController
 				'products' => $result, // DEPRECATED (since to 1.4), not use this: conflict with block_cart module
 				'search_products' => $result,
 				'nbProducts' => $nbProducts,
-				'homeSize' => Image::getSize('home')));
+				'homeSize' => Image::getSize('home_default')));
 		}
 		else
 		{
@@ -263,7 +263,7 @@ class StoresControllerCore extends FrontController
 			$this->assignStores();

 		$this->context->smarty->assign(array(
-			'mediumSize' => Image::getSize('medium'),
+			'mediumSize' => Image::getSize('medium_default'),
 			'defaultLat' => (float)Configuration::get('PS_STORES_CENTER_LAT'),
 			'defaultLong' => (float)Configuration::get('PS_STORES_CENTER_LONG'),
 			'searchUrl' => $this->context->link->getPageLink('stores'),
@@ -120,7 +120,7 @@ class SupplierControllerCore extends FrontController
 			$this->context->smarty->assign(array(
 				'pages_nb' => ceil($nbProducts / (int)$this->n),
 				'nbSuppliers' => $nbProducts,
-				'mediumSize' => Image::getSize('medium'),
+				'mediumSize' => Image::getSize('medium_default'),
 				'suppliers_list' => $suppliers,
 				'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
 			));
@@ -674,7 +674,7 @@ class InstallXmlLoader
 				@chmod($target_file, 0644);
 			}
 			// Resize the image if no cache was prepared in fixtures
-			else if (!ImageManager::resize($path.$id.'.jpg', $target_file, $type['width'], $type['height']))
+			else if (!ImageManager::resize($path.$identifier.'.jpg', $target_file, $type['width'], $type['height']))
 				$this->setError($this->language->l('Cannot create image "%1$s" for entity "%2$s"', $identifier.'-'.$type['name'], 'product'));
 		}
 	}
@@ -12,13 +12,13 @@
    <field name="stores"/>
  </fields>
  <entities>
-    <image_type id="small" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="medium" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
-    <image_type id="large" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="thickbox" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="category" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="home" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="large_scene" name="large_scene" width="520" height="189" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
-    <image_type id="thumb_scene" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+    <image_type id="small_default" name="small_default" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="medium_default" name="medium_default" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
+    <image_type id="large_default" name="large_default" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="thickbox_default" name="thickbox_default" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="category_default" name="category_default" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="home_default" name="home_default" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="scene_default" name="scene_default" width="520" height="189" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+    <image_type id="m_scene_default" name="m_scene_default" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
  </entities>
 </entity_image_type>
--- a/Show More
+++ b/Show More