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

//remove mobile theme

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-05-09 20:57:15 +00:00
parent 0a0f47efbb
commit 4f3e19ed5f
27 changed files with 34 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/ContactController.php
+1 -3
View File
@@ -194,9 +194,7 @@ class ContactControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
// These CSS isn't used for the mobile theme.
if ($this->context->getMobileDevice() == false)
$this->addCSS(_THEME_CSS_DIR_.'contact-form.css');
$this->addCSS(_THEME_CSS_DIR_.'contact-form.css');
}
/**
controllers/front/IdentityController.php
+1 -2
View File
@@ -131,8 +131,7 @@ class IdentityControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
if ($this->context->getMobileDevice() == false)
$this->addCSS(_THEME_CSS_DIR_.'identity.css');
$this->addCSS(_THEME_CSS_DIR_.'identity.css');
}
}
controllers/front/ProductController.php
+7 -15
View File
@@ -41,21 +41,13 @@ class ProductControllerCore extends FrontController
{
parent::setMedia();
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->addJS(array(
_THEME_JS_DIR_.'tools.js',
_THEME_MOBILE_JS_DIR_.'product.js'
));
$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 (Configuration::get('PS_DISPLAY_JQZOOM') == 1)
$this->addJqueryPlugin('jqzoom');
controllers/front/StoresController.php
+3 -22
View File
@@ -175,17 +175,6 @@ class StoresControllerCore extends FrontController
*/
protected function displayAjax()
{
if ($this->context->getMobileDevice() == true)
{
$stores = $this->getStores();
foreach ($stores as &$store)
{
if (file_exists(_PS_STORE_IMG_DIR_.(int)$store['id_store'].'.jpg'))
$store['picture'] = (int)$store['id_store'].'.jpg';
}
die(Tools::jsonEncode($stores));
}
$stores = $this->getStores();
$dom = new DOMDocument('1.0');
$node = $dom->createElement('markers');
@@ -269,17 +258,9 @@ class StoresControllerCore extends FrontController
public function setMedia()
{
parent::setMedia();
$this->addCSS(_THEME_CSS_DIR_.'stores.css');
if (!Configuration::get('PS_STORES_SIMPLIFIED'))
$this->addJS(_THEME_JS_DIR_.'stores.js');
$this->addJS('http://maps.google.com/maps/api/js?sensor=true');
if ($this->context->getMobileDevice() == false)
{
$this->addCSS(_THEME_CSS_DIR_.'stores.css');
if (!Configuration::get('PS_STORES_SIMPLIFIED'))
$this->addJS(_THEME_JS_DIR_.'stores.js');
}
else // mobile device
$this->addJS(array(
_THEME_MOBILE_JS_DIR_.'stores.js'
));
}
}