dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sLorenzini
2012-09-21 14:59:51 +00:00
parent de29614c03
commit 4896b787f3
574 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/BestSalesController.php
+1 -1
View File
@@ -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');
controllers/front/CategoryController.php
+6 -6
View File
@@ -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;
}
controllers/front/CompareController.php
+1 -1
View File
@@ -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)));
}
controllers/front/ManufacturerController.php
+1 -1
View File
@@ -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'),
));
controllers/front/NewProductsController.php
+1 -1
View File
@@ -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');
controllers/front/PricesDropController.php
+1 -1
View File
@@ -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');
controllers/front/ProductController.php
+4 -4
View File
@@ -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);
controllers/front/SearchController.php
+3 -3
View File
@@ -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
{
controllers/front/StoresController.php
+1 -1
View File
@@ -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'),
controllers/front/SupplierController.php
+1 -1
View File
@@ -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'),
));