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

[+] FO : mobile theme re-included in the trunk

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17060 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-28 15:47:12 +00:00
parent caccf77b10
commit 85f8e3db2f
97 changed files with 8534 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ProductController.php
+19 -7
View File
@@ -41,13 +41,25 @@ class ProductControllerCore extends FrontController
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
$this->addJS(array(
_THEME_JS_DIR_.'tools.js',
_THEME_JS_DIR_.'product.js'
));
if ($this->context->getMobileDevice() == false)
{
$this->addCSS(_THEME_CSS_DIR_.'product.css');
$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
$this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll'));
$this->addJS(array(
_THEME_JS_DIR_.'tools.js',
_THEME_JS_DIR_.'product.js'
));
}
else
{
$this->addJqueryPlugin(array('scrollTo', 'serialScroll'));
$this->addJS(array(
_THEME_JS_DIR_.'tools.js',
_THEME_MOBILE_JS_DIR_.'product.js',
_THEME_MOBILE_JS_DIR_.'jquery.touch-gallery.js'
));
}
if (Configuration::get('PS_DISPLAY_JQZOOM') == 1)
$this->addJqueryPlugin('jqzoom');